1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/third_party/WebKit/Source/web/WebPluginDocument.cpp b/chromium/third_party/WebKit/Source/web/WebPluginDocument.cpp
index 012797fca43..6516b3f1f39 100644
--- a/chromium/third_party/WebKit/Source/web/WebPluginDocument.cpp
+++ b/chromium/third_party/WebKit/Source/web/WebPluginDocument.cpp
@@ -29,12 +29,12 @@
  */
 
 #include "config.h"
-#include "WebPluginDocument.h"
+#include "public/web/WebPluginDocument.h"
 
 #include "core/dom/Document.h"
 #include "core/html/PluginDocument.h"
 
-#include "WebPluginContainerImpl.h"
+#include "web/WebPluginContainerImpl.h"
 
 #include "wtf/PassRefPtr.h"
 
@@ -48,23 +48,23 @@ WebPlugin* WebPluginDocument::plugin()
     if (!isPluginDocument())
         return 0;
     PluginDocument* doc = unwrap<PluginDocument>();
-    WebPluginContainerImpl* container = toPluginContainerImpl(doc->pluginWidget());
-    return container->plugin();
+    WebPluginContainerImpl* container = toWebPluginContainerImpl(doc->pluginWidget());
+    return container ? container->plugin() : 0;
 }
 
 
-WebPluginDocument::WebPluginDocument(const PassRefPtr<PluginDocument>& elem)
+WebPluginDocument::WebPluginDocument(const PassRefPtrWillBeRawPtr<PluginDocument>& elem)
     : WebDocument(elem)
 {
 }
 
-WebPluginDocument& WebPluginDocument::operator=(const PassRefPtr<PluginDocument>& elem)
+WebPluginDocument& WebPluginDocument::operator=(const PassRefPtrWillBeRawPtr<PluginDocument>& elem)
 {
     m_private = elem;
     return *this;
 }
 
-WebPluginDocument::operator PassRefPtr<PluginDocument>() const
+WebPluginDocument::operator PassRefPtrWillBeRawPtr<PluginDocument>() const
 {
     return static_cast<PluginDocument*>(m_private.get());
 }