Move webpreferences.* from webkit/ to content/

BUG=338338
TEST=None
R=jam@chromium.org
TBR=boliu@chromium.org # for android_webview
TBR=bauerb@chromium.org # for components/plugins
TBR=dmichael@chromium.org # for ppapi

Review URL: https://codereview.chromium.org/357203003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281978 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 7 deletions

diff --git a/components/plugins/renderer/webview_plugin.cc b/components/plugins/renderer/webview_plugin.cc
index 1e83995..c8abe0b 100644
--- a/components/plugins/renderer/webview_plugin.cc
+++ b/components/plugins/renderer/webview_plugin.cc
@@ -7,7 +7,8 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
-#include "content/public/renderer/web_preferences.h"
+#include "content/public/common/web_preferences.h"
+#include "content/public/renderer/render_view.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ -19,7 +20,6 @@
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "webkit/common/webpreferences.h"
 
 using blink::WebCanvas;
 using blink::WebCursorInfo;
@@ -40,6 +40,7 @@ using blink::WebURLRequest;
 using blink::WebURLResponse;
 using blink::WebVector;
 using blink::WebView;
+using content::WebPreferences;
 
 WebViewPlugin::WebViewPlugin(WebViewPlugin::Delegate* delegate,
                              const WebPreferences& preferences)
@@ -50,7 +51,7 @@ WebViewPlugin::WebViewPlugin(WebViewPlugin::Delegate* delegate,
       focused_(false) {
   // ApplyWebPreferences before making a WebLocalFrame so that the frame sees a
   // consistent view of our preferences.
-  content::ApplyWebPreferences(preferences, web_view_);
+  content::RenderView::ApplyWebPreferences(preferences, web_view_);
   web_frame_ = WebLocalFrame::create(this);
   web_view_->setMainFrame(web_frame_);
 }
diff --git a/components/plugins/renderer/webview_plugin.h b/components/plugins/renderer/webview_plugin.h
index 9384522..2bdd437 100644
--- a/components/plugins/renderer/webview_plugin.h
+++ b/components/plugins/renderer/webview_plugin.h
@@ -16,12 +16,15 @@
 #include "third_party/WebKit/public/web/WebPlugin.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
 
-struct WebPreferences;
-
 namespace blink {
 class WebMouseEvent;
 }
 
+namespace content {
+class RenderView;
+struct WebPreferences;
+}
+
 // This class implements the WebPlugin interface by forwarding drawing and
 // handling input events to a WebView.
 // It can be used as a placeholder for an actual plugin, using HTML for the UI.
@@ -51,7 +54,7 @@ class WebViewPlugin : public blink::WebPlugin,
   // and displaying |html_data|. |url| should be a (fake) chrome:// URL; it is
   // only used for navigation and never actually resolved.
   static WebViewPlugin* Create(Delegate* delegate,
-                               const WebPreferences& preferences,
+                               const content::WebPreferences& preferences,
                                const std::string& html_data,
                                const GURL& url);
 
@@ -135,7 +138,7 @@ class WebViewPlugin : public blink::WebPlugin,
 
  private:
   friend class base::DeleteHelper<WebViewPlugin>;
-  WebViewPlugin(Delegate* delegate, const WebPreferences& preferences);
+  WebViewPlugin(Delegate* delegate, const content::WebPreferences& preferences);
   virtual ~WebViewPlugin();
 
   // Manages its own lifetime.