Merge 145319

Source/WebKit/chromium/src/WebHelperPluginImpl.h

Index: Source/WebKit/chromium/src/WebHelperPluginImpl.h
===================================================================
--- Source/WebKit/chromium/src/WebHelperPluginImpl.h	(revision 145645)
+++ Source/WebKit/chromium/src/WebHelperPluginImpl.h	(working copy)
@@ -42,6 +42,8 @@
 namespace WebKit {
 
 class HelperPluginChromeClient;
+class WebDocument;
+class WebFrame;
 class WebViewImpl;
 class WebWidgetClient;
 
@@ -54,7 +56,7 @@
 
 public:
     virtual ~WebHelperPluginImpl();
-    bool initialize(WebViewImpl*, const String& pluginType);
+    bool initialize(const String& pluginType, const WebDocument& hostDocument, WebViewImpl*);
     void closeHelperPlugin();
 
     // WebHelperPlugin methods:
@@ -63,7 +65,7 @@
 
 private:
     explicit WebHelperPluginImpl(WebWidgetClient*);
-    bool initializePage(WebKit::WebViewImpl*, const String& pluginType);
+    bool initializePage(const String& pluginType, const WebDocument& hostDocument);
     void destoryPage();
 
     // WebWidget methods: