Move RendererPreferences to content/public/common and also put in the content namespace.

BUG=76697
Review URL: http://codereview.chromium.org/8432011

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

28 files changed, 147 insertions, 139 deletions

diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 717816c..8b2eba1 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -510,10 +510,10 @@ void ExtensionHost::Close(RenderViewHost* render_view_host) {
   }
 }
 
-RendererPreferences ExtensionHost::GetRendererPrefs(
+content::RendererPreferences ExtensionHost::GetRendererPrefs(
     content::BrowserContext* browser_context) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
-  RendererPreferences preferences;
+  content::RendererPreferences preferences;
 
   TabContents* associated_contents = GetAssociatedTabContents();
   if (associated_contents)
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 9777dda..0adc57d 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -139,7 +139,7 @@ class ExtensionHost : public RenderViewHostDelegate,
                                     IPC::Message* reply_msg,
                                     bool* did_suppress_message) OVERRIDE;
   virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
-  virtual RendererPreferences GetRendererPrefs(
+  virtual content::RendererPreferences GetRendererPrefs(
       content::BrowserContext* browser_context) const OVERRIDE;
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut) OVERRIDE;
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 143ceff..363ae45 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -39,7 +39,6 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/common/renderer_preferences.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc
index ca63c90..9109d15 100644
--- a/chrome/browser/notifications/balloon_host.cc
+++ b/chrome/browser/notifications/balloon_host.cc
@@ -18,10 +18,10 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/public/browser/notification_service.h"
-#include "content/common/renderer_preferences.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/bindings_policy.h"
+#include "content/public/common/renderer_preferences.h"
 #include "ipc/ipc_message.h"
 #include "webkit/glue/webpreferences.h"
 
@@ -165,10 +165,10 @@ void BalloonHost::HandleMouseDown() {
   balloon_->OnClick();
 }
 
-RendererPreferences BalloonHost::GetRendererPrefs(
+content::RendererPreferences BalloonHost::GetRendererPrefs(
     content::BrowserContext* browser_context) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
-  RendererPreferences preferences;
+  content::RendererPreferences preferences;
   renderer_preferences_util::UpdateFromSystemSettings(&preferences, profile);
   return preferences;
 }
diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h
index 3ad69f3..e55cefa 100644
--- a/chrome/browser/notifications/balloon_host.h
+++ b/chrome/browser/notifications/balloon_host.h
@@ -20,7 +20,6 @@ class Balloon;
 class Browser;
 class Profile;
 class SiteInstance;
-struct RendererPreferences;
 struct WebPreferences;
 
 namespace IPC {
@@ -60,7 +59,7 @@ class BalloonHost : public RenderViewHostDelegate,
   virtual content::ViewType GetRenderViewType() const OVERRIDE;
   virtual RenderViewHostDelegate::View* GetViewDelegate() OVERRIDE;
   virtual void HandleMouseDown() OVERRIDE;
-  virtual RendererPreferences GetRendererPrefs(
+  virtual content::RendererPreferences GetRendererPrefs(
       content::BrowserContext* browser_context) const OVERRIDE;
   virtual void UpdatePreferredSize(const gfx::Size& pref_size) OVERRIDE;
 
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index a585d43..4339473 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/common/renderer_preferences.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ -15,7 +16,8 @@
 
 namespace renderer_preferences_util {
 
-void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) {
+void UpdateFromSystemSettings(
+    content::RendererPreferences* prefs, Profile* profile) {
 #if defined(TOOLKIT_USES_GTK)
   gtk_util::UpdateGtkFontSettings(prefs);
 
diff --git a/chrome/browser/renderer_preferences_util.h b/chrome/browser/renderer_preferences_util.h
index ccca11a..e26da26 100644
--- a/chrome/browser/renderer_preferences_util.h
+++ b/chrome/browser/renderer_preferences_util.h
@@ -6,14 +6,17 @@
 #define CHROME_BROWSER_RENDERER_PREFERENCES_UTIL_H_
 #pragma once
 
-#include "content/common/renderer_preferences.h"
-
 class Profile;
 
+namespace content {
+struct RendererPreferences;
+}
+
 namespace renderer_preferences_util {
 
 // Copies system configuration preferences into |prefs|.
-void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile);
+void UpdateFromSystemSettings(content::RendererPreferences* prefs,
+                              Profile* profile);
 
 }  // namespace renderer_preferences_util
 
diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc
index 33af53f..ddbd45d 100644
--- a/chrome/browser/tab_contents/background_contents.cc
+++ b/chrome/browser/tab_contents/background_contents.cc
@@ -176,10 +176,10 @@ void BackgroundContents::RenderViewGone(RenderViewHost* rvh,
   delete this;
 }
 
-RendererPreferences BackgroundContents::GetRendererPrefs(
+content::RendererPreferences BackgroundContents::GetRendererPrefs(
     content::BrowserContext* browser_context) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
-  RendererPreferences preferences;
+  content::RendererPreferences preferences;
   renderer_preferences_util::UpdateFromSystemSettings(&preferences, profile);
   return preferences;
 }
diff --git a/chrome/browser/tab_contents/background_contents.h b/chrome/browser/tab_contents/background_contents.h
index 8b78a27..90c49c1 100644
--- a/chrome/browser/tab_contents/background_contents.h
+++ b/chrome/browser/tab_contents/background_contents.h
@@ -75,7 +75,7 @@ class BackgroundContents : public RenderViewHostDelegate,
                                     IPC::Message* reply_msg,
                                     bool* did_suppress_message) OVERRIDE;
   virtual void Close(RenderViewHost* render_view_host) OVERRIDE;
-  virtual RendererPreferences GetRendererPrefs(
+  virtual content::RendererPreferences GetRendererPrefs(
       content::BrowserContext* browser_context) const OVERRIDE;
   virtual void RenderViewGone(RenderViewHost* rvh,
                               base::TerminationStatus status,
diff --git a/chrome/browser/tab_contents/chrome_interstitial_page.cc b/chrome/browser/tab_contents/chrome_interstitial_page.cc
index d42a5eb..ce07ed9 100644
--- a/chrome/browser/tab_contents/chrome_interstitial_page.cc
+++ b/chrome/browser/tab_contents/chrome_interstitial_page.cc
@@ -17,7 +17,7 @@ ChromeInterstitialPage::ChromeInterstitialPage(TabContents* tab,
                                                const GURL& url)
     : InterstitialPage(tab, new_navigation, url) {
   Profile* profile = Profile::FromBrowserContext(tab->browser_context());
-  RendererPreferences prefs;
+  content::RendererPreferences prefs;
   renderer_preferences_util::UpdateFromSystemSettings(&prefs, profile);
   set_renderer_preferences(prefs);
 }
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index cea5207..b5fa941 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -30,7 +30,7 @@
 #include "content/browser/disposition_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/renderer_preferences.h"
+#include "content/public/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
@@ -636,7 +636,7 @@ GtkWidget* IndentWidget(GtkWidget* content) {
   return content_alignment;
 }
 
-void UpdateGtkFontSettings(RendererPreferences* prefs) {
+void UpdateGtkFontSettings(content::RendererPreferences* prefs) {
   DCHECK(prefs);
 
   // From http://library.gnome.org/devel/gtk/unstable/GtkSettings.html, this is
@@ -660,9 +660,9 @@ void UpdateGtkFontSettings(RendererPreferences* prefs) {
 
   // Set some reasonable defaults.
   prefs->should_antialias_text = true;
-  prefs->hinting = RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT;
+  prefs->hinting = content::RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT;
   prefs->subpixel_rendering =
-      RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT;
+      content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT;
 
   if (cursor_blink) {
     // Dividing by 2*1000ms follows the WebKit GTK port and makes the blink
@@ -680,25 +680,30 @@ void UpdateGtkFontSettings(RendererPreferences* prefs) {
     prefs->should_antialias_text = antialias;
 
     if (hinting == 0 || strcmp(hint_style, "hintnone") == 0) {
-      prefs->hinting = RENDERER_PREFERENCES_HINTING_NONE;
+      prefs->hinting = content::RENDERER_PREFERENCES_HINTING_NONE;
     } else if (strcmp(hint_style, "hintslight") == 0) {
-      prefs->hinting = RENDERER_PREFERENCES_HINTING_SLIGHT;
+      prefs->hinting = content::RENDERER_PREFERENCES_HINTING_SLIGHT;
     } else if (strcmp(hint_style, "hintmedium") == 0) {
-      prefs->hinting = RENDERER_PREFERENCES_HINTING_MEDIUM;
+      prefs->hinting = content::RENDERER_PREFERENCES_HINTING_MEDIUM;
     } else if (strcmp(hint_style, "hintfull") == 0) {
-      prefs->hinting = RENDERER_PREFERENCES_HINTING_FULL;
+      prefs->hinting = content::RENDERER_PREFERENCES_HINTING_FULL;
     }
 
     if (strcmp(rgba_style, "none") == 0) {
-      prefs->subpixel_rendering = RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE;
+      prefs->subpixel_rendering =
+          content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE;
     } else if (strcmp(rgba_style, "rgb") == 0) {
-      prefs->subpixel_rendering = RENDERER_PREFERENCES_SUBPIXEL_RENDERING_RGB;
+      prefs->subpixel_rendering =
+          content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_RGB;
     } else if (strcmp(rgba_style, "bgr") == 0) {
-      prefs->subpixel_rendering = RENDERER_PREFERENCES_SUBPIXEL_RENDERING_BGR;
+      prefs->subpixel_rendering =
+          content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_BGR;
     } else if (strcmp(rgba_style, "vrgb") == 0) {
-      prefs->subpixel_rendering = RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VRGB;
+      prefs->subpixel_rendering =
+          content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VRGB;
     } else if (strcmp(rgba_style, "vbgr") == 0) {
-      prefs->subpixel_rendering = RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VBGR;
+      prefs->subpixel_rendering =
+          content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VBGR;
     }
   }
 
diff --git a/chrome/browser/ui/gtk/gtk_util.h b/chrome/browser/ui/gtk/gtk_util.h
index 6febcc4..7059d38 100644
--- a/chrome/browser/ui/gtk/gtk_util.h
+++ b/chrome/browser/ui/gtk/gtk_util.h
@@ -24,7 +24,10 @@ class BrowserWindow;
 class GtkThemeService;
 class GURL;
 class Profile;
-struct RendererPreferences;  // from common/renderer_preferences.h
+
+namespace content {
+struct RendererPreferences;
+}
 
 namespace event_utils {
 
@@ -191,7 +194,7 @@ GtkWidget* IndentWidget(GtkWidget* content);
 
 // Sets (or resets) the font settings in |prefs| (used when creating new
 // renderers) based on GtkSettings (which itself comes from XSETTINGS).
-void UpdateGtkFontSettings(RendererPreferences* prefs);
+void UpdateGtkFontSettings(content::RendererPreferences* prefs);
 
 // Reverses a point in RTL mode. Used in making vectors of GdkPoints for window
 // shapes.
diff --git a/chrome/test/base/chrome_render_view_test.cc b/chrome/test/base/chrome_render_view_test.cc
index 98e5e68..926b86c 100644
--- a/chrome/test/base/chrome_render_view_test.cc
+++ b/chrome/test/base/chrome_render_view_test.cc
@@ -16,9 +16,9 @@
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "content/common/dom_storage_common.h"
-#include "content/common/renderer_preferences.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/native_web_keyboard_event.h"
+#include "content/public/common/renderer_preferences.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_main_platform_delegate.h"
 #include "content/test/mock_render_process.h"
diff --git a/content/browser/renderer_host/render_view_host_delegate.cc b/content/browser/renderer_host/render_view_host_delegate.cc
index 6cd4a0b..c76aee9 100644
--- a/content/browser/renderer_host/render_view_host_delegate.cc
+++ b/content/browser/renderer_host/render_view_host_delegate.cc
@@ -5,7 +5,7 @@
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 
 #include "base/memory/singleton.h"
-#include "content/common/renderer_preferences.h"
+#include "content/public/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/webpreferences.h"
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index e973874..9f4991d 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -24,27 +24,28 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "webkit/glue/window_open_disposition.h"
 
+
 class BackgroundContents;
-struct BookmarkNodeData;
 class BookmarkNode;
-struct ContextMenuParams;
 class GURL;
-struct NativeWebKeyboardEvent;
-struct RendererPreferences;
 class RenderProcessHost;
 class RenderViewHost;
 class SkBitmap;
 class TabContents;
+class WebKeyboardEvent;
+struct BookmarkNodeData;
+struct ContextMenuParams;
+struct NativeWebKeyboardEvent;
 struct ViewHostMsg_CreateWindow_Params;
 struct ViewHostMsg_FrameNavigate_Params;
+struct ViewHostMsg_RunFileChooser_Params;
 struct WebDropData;
 struct WebMenuItem;
-class WebKeyboardEvent;
 struct WebPreferences;
-struct ViewHostMsg_RunFileChooser_Params;
 
 namespace content {
 class BrowserContext;
+struct RendererPreferences;
 }
 
 namespace gfx {
@@ -302,7 +303,7 @@ class CONTENT_EXPORT RenderViewHostDelegate : public IPC::Channel::Listener {
 
   // Return a dummy RendererPreferences object that will be used by the renderer
   // associated with the owning RenderViewHost.
-  virtual RendererPreferences GetRendererPrefs(
+  virtual content::RendererPreferences GetRendererPrefs(
       content::BrowserContext* browser_context) const = 0;
 
   // Returns a WebPreferences object that will be used by the renderer
diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc
index 8da9525..d11987f 100644
--- a/content/browser/tab_contents/interstitial_page.cc
+++ b/content/browser/tab_contents/interstitial_page.cc
@@ -405,7 +405,7 @@ void InterstitialPage::UpdateTitle(RenderViewHost* render_view_host,
   tab_->NotifyNavigationStateChanged(TabContents::INVALIDATE_TITLE);
 }
 
-RendererPreferences InterstitialPage::GetRendererPrefs(
+content::RendererPreferences InterstitialPage::GetRendererPrefs(
     content::BrowserContext* browser_context) const {
   return renderer_preferences_;
 }
diff --git a/content/browser/tab_contents/interstitial_page.h b/content/browser/tab_contents/interstitial_page.h
index 98fbe9e..cafe719 100644
--- a/content/browser/tab_contents/interstitial_page.h
+++ b/content/browser/tab_contents/interstitial_page.h
@@ -13,9 +13,9 @@
 #include "base/process_util.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/common/content_export.h"
-#include "content/common/renderer_preferences.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/size.h"
 
@@ -129,7 +129,7 @@ class CONTENT_EXPORT InterstitialPage : public content::NotificationObserver,
                            int32 page_id,
                            const string16& title,
                            base::i18n::TextDirection title_direction) OVERRIDE;
-  virtual RendererPreferences GetRendererPrefs(
+  virtual content::RendererPreferences GetRendererPrefs(
       content::BrowserContext* browser_context) const OVERRIDE;
 
   // Invoked with the NavigationEntry that is going to be added to the
@@ -143,7 +143,7 @@ class CONTENT_EXPORT InterstitialPage : public content::NotificationObserver,
   TabContents* tab() const { return tab_; }
   const GURL& url() const { return url_; }
   RenderViewHost* render_view_host() const { return render_view_host_; }
-  void set_renderer_preferences(const RendererPreferences& prefs) {
+  void set_renderer_preferences(const content::RendererPreferences& prefs) {
     renderer_preferences_ = prefs;
   }
 
@@ -239,7 +239,7 @@ class CONTENT_EXPORT InterstitialPage : public content::NotificationObserver,
   static InterstitialPageMap* tab_to_interstitial_page_;
 
   // Settings passed to the renderer.
-  RendererPreferences renderer_preferences_;
+  content::RendererPreferences renderer_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialPage);
 };
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 2e791b0..9a763e9 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -1400,7 +1400,7 @@ TabContents::GetRendererManagementDelegate() {
   return &render_manager_;
 }
 
-RendererPreferences TabContents::GetRendererPrefs(
+content::RendererPreferences TabContents::GetRendererPrefs(
     content::BrowserContext* browser_context) const {
   return renderer_preferences_;
 }
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index f06d947..be49b11 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -27,7 +27,7 @@
 #include "content/browser/webui/web_ui.h"
 #include "content/common/content_export.h"
 #include "content/common/property_bag.h"
-#include "content/common/renderer_preferences.h"
+#include "content/public/common/renderer_preferences.h"
 #include "net/base/load_states.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/resource_type.h"
@@ -36,30 +36,19 @@
 #include "base/win/scoped_handle.h"
 #endif
 
-namespace gfx {
-class Rect;
-}
-namespace webkit_glue {
-struct WebIntentData;
-}
-
 class DownloadItem;
 class LoadNotificationDetails;
-struct RendererPreferences;
 class RenderViewHost;
 class SessionStorageNamespace;
 class SiteInstance;
-class SkBitmap;
 class TabContentsDelegate;
 class TabContentsObserver;
 class TabContentsView;
-struct ThumbnailScore;
-class URLPattern;
 struct ViewHostMsg_DidFailProvisionalLoadWithError_Params;
-struct ViewHostMsg_FrameNavigate_Params;
-struct ViewHostMsg_RunFileChooser_Params;
-struct WebPreferences;
-class WebUI;
+
+namespace webkit_glue {
+struct WebIntentData;
+}
 
 // Describes what goes in the main content area of a tab. TabContents is
 // the only type of TabContents, and these should be merged together.
@@ -403,7 +392,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
   // ViewMsg_ResetPageEncodingToDefault to the renderer.
   void ResetOverrideEncoding();
 
-  RendererPreferences* GetMutableRendererPrefs() {
+  content::RendererPreferences* GetMutableRendererPrefs() {
     return &renderer_preferences_;
   }
 
@@ -670,7 +659,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
   virtual void RunBeforeUnloadConfirm(const RenderViewHost* rvh,
                                       const string16& message,
                                       IPC::Message* reply_msg) OVERRIDE;
-  virtual RendererPreferences GetRendererPrefs(
+  virtual content::RendererPreferences GetRendererPrefs(
       content::BrowserContext* browser_context) const OVERRIDE;
   virtual WebPreferences GetWebkitPrefs() OVERRIDE;
   virtual void OnUserGesture() OVERRIDE;
@@ -830,7 +819,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
   bool is_showing_before_unload_dialog_;
 
   // Settings that get passed to the renderer process.
-  RendererPreferences renderer_preferences_;
+  content::RendererPreferences renderer_preferences_;
 
   // If this tab was created from a renderer using window.open, this will be
   // non-NULL and represent the WebUI of the opening renderer.
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 56c6595..8a1ef8a 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -11,10 +11,10 @@
 #include "content/common/css_colors.h"
 #include "content/common/edit_command.h"
 #include "content/common/navigation_gesture.h"
-#include "content/common/renderer_preferences.h"
 #include "content/common/view_message_enums.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/page_zoom.h"
+#include "content/public/common/renderer_preferences.h"
 #include "content/public/common/webkit_param_traits.h"
 #include "content/public/common/window_container_type.h"
 #include "ipc/ipc_channel_handle.h"
@@ -52,8 +52,6 @@
 IPC_ENUM_TRAITS(CSSColors::CSSColorName)
 IPC_ENUM_TRAITS(NavigationGesture)
 IPC_ENUM_TRAITS(content::PageZoom)
-IPC_ENUM_TRAITS(RendererPreferencesHintingEnum)
-IPC_ENUM_TRAITS(RendererPreferencesSubpixelRenderingEnum)
 IPC_ENUM_TRAITS(ViewHostMsg_AccEvent::Value)
 IPC_ENUM_TRAITS(ViewHostMsg_RunFileChooser_Mode::Value)
 IPC_ENUM_TRAITS(ViewMsg_Navigate_Type::Value)
@@ -62,16 +60,18 @@ IPC_ENUM_TRAITS(WebKit::WebContextMenuData::MediaType)
 IPC_ENUM_TRAITS(WebKit::WebMediaPlayerAction::Type)
 IPC_ENUM_TRAITS(WebKit::WebPopupType)
 IPC_ENUM_TRAITS(WebKit::WebTextDirection)
-IPC_ENUM_TRAITS(ui::TextInputType)
 IPC_ENUM_TRAITS(WebMenuItem::Type)
 IPC_ENUM_TRAITS(WindowContainerType)
+IPC_ENUM_TRAITS(ui::TextInputType)
+IPC_ENUM_TRAITS(content::RendererPreferencesHintingEnum)
+IPC_ENUM_TRAITS(content::RendererPreferencesSubpixelRenderingEnum)
+IPC_ENUM_TRAITS(media::MediaLogEvent::Type)
 IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::BoolAttribute)
 IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::FloatAttribute)
 IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::IntAttribute)
 IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::Role)
 IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::State)
 IPC_ENUM_TRAITS(webkit_glue::WebAccessibility::StringAttribute)
-IPC_ENUM_TRAITS(media::MediaLogEvent::Type)
 
 IPC_STRUCT_TRAITS_BEGIN(ContextMenuParams)
   IPC_STRUCT_TRAITS_MEMBER(media_type)
@@ -116,7 +116,7 @@ IPC_STRUCT_TRAITS_BEGIN(FontDescriptor)
 IPC_STRUCT_TRAITS_END()
 #endif
 
-IPC_STRUCT_TRAITS_BEGIN(RendererPreferences)
+IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
   IPC_STRUCT_TRAITS_MEMBER(can_accept_load_drops)
   IPC_STRUCT_TRAITS_MEMBER(should_antialias_text)
   IPC_STRUCT_TRAITS_MEMBER(hinting)
@@ -631,7 +631,7 @@ IPC_STRUCT_BEGIN(ViewMsg_New_Params)
   IPC_STRUCT_MEMBER(gfx::NativeViewId, parent_window)
 
   // Renderer-wide preferences.
-  IPC_STRUCT_MEMBER(RendererPreferences, renderer_preferences)
+  IPC_STRUCT_MEMBER(content::RendererPreferences, renderer_preferences)
 
   // Preferences for this view.
   IPC_STRUCT_MEMBER(WebPreferences, web_preferences)
@@ -703,7 +703,7 @@ IPC_MESSAGE_ROUTED1(ViewMsg_CreatingNew_ACK,
 
 // Sends updated preferences to the renderer.
 IPC_MESSAGE_ROUTED1(ViewMsg_SetRendererPrefs,
-                    RendererPreferences)
+                    content::RendererPreferences)
 
 // This passes a set of webkit preferences down to the renderer.
 IPC_MESSAGE_ROUTED1(ViewMsg_UpdateWebPreferences,
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 0595c04..fca0116 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -47,6 +47,8 @@
     'public/common/page_zoom.h',
     'public/common/pepper_plugin_info.cc',
     'public/common/pepper_plugin_info.h',
+    'public/common/renderer_preferences.cc',
+    'public/common/renderer_preferences.h',
     'public/common/resource_dispatcher_delegate.h',
     'public/common/result_codes.h',
     'public/common/sandbox_init.h',
@@ -197,8 +199,6 @@
     'common/quota_messages.h',
     'common/quota_dispatcher.cc',
     'common/quota_dispatcher.h',
-    'common/renderer_preferences.cc',
-    'common/renderer_preferences.h',
     'common/request_extra_data.cc',
     'common/request_extra_data.h',
     'common/resource_dispatcher.cc',
diff --git a/content/common/renderer_preferences.cc b/content/public/common/renderer_preferences.cc
index 9a20600..d117657 100644
--- a/content/common/renderer_preferences.cc
+++ b/content/public/common/renderer_preferences.cc
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/renderer_preferences.h"
+#include "content/public/common/renderer_preferences.h"
+
+namespace content {
 
 RendererPreferences::RendererPreferences()
     : can_accept_load_drops(true),
@@ -22,3 +24,5 @@ RendererPreferences::RendererPreferences()
       caret_blink_interval(0),
       enable_referrers(true) {
 }
+
+}  // namespace content
diff --git a/content/common/renderer_preferences.h b/content/public/common/renderer_preferences.h
index e622464..7275e72 100644
--- a/content/common/renderer_preferences.h
+++ b/content/public/common/renderer_preferences.h
@@ -7,15 +7,17 @@
 // glue layer rather than applying to just WebKit.
 //
 // Adding new values to this class probably involves updating
-// common/render_messages.h, browser/browser.cc, etc.
+// common/view_messages.h, browser/browser.cc, etc.
 
-#ifndef CONTENT_COMMON_RENDERER_PREFERENCES_H_
-#define CONTENT_COMMON_RENDERER_PREFERENCES_H_
+#ifndef CONTENT_PUBLIC_COMMON_RENDERER_PREFERENCES_H_
+#define CONTENT_PUBLIC_COMMON_RENDERER_PREFERENCES_H_
 #pragma once
 
 #include "content/common/content_export.h"
 #include "third_party/skia/include/core/SkColor.h"
 
+namespace content {
+
 enum RendererPreferencesHintingEnum {
   RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT = 0,
   RENDERER_PREFERENCES_HINTING_NONE,
@@ -79,4 +81,6 @@ struct CONTENT_EXPORT RendererPreferences {
   bool enable_referrers;
 };
 
-#endif  // CONTENT_COMMON_RENDERER_PREFERENCES_H_
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_COMMON_RENDERER_PREFERENCES_H_
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 1e12307..962e856 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -30,12 +30,12 @@
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
-#include "content/common/renderer_preferences.h"
 #include "content/common/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
 #include "content/common/web_database_observer_impl.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/renderer_preferences.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 79d2a40..47a602f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -35,7 +35,6 @@
 #include "content/common/pepper_messages.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/common/quota_dispatcher.h"
-#include "content/common/renderer_preferences.h"
 #include "content/common/request_extra_data.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/bindings_policy.h"
@@ -304,14 +303,15 @@ struct RenderViewImpl::PendingFileChooser {
   WebFileChooserCompletion* completion;  // MAY BE NULL to skip callback.
 };
 
-RenderViewImpl::RenderViewImpl(gfx::NativeViewId parent_hwnd,
-                               int32 opener_id,
-                               const RendererPreferences& renderer_prefs,
-                               const WebPreferences& webkit_prefs,
-                               SharedRenderViewCounter* counter,
-                               int32 routing_id,
-                               int64 session_storage_namespace_id,
-                               const string16& frame_name)
+RenderViewImpl::RenderViewImpl(
+    gfx::NativeViewId parent_hwnd,
+    int32 opener_id,
+    const content::RendererPreferences& renderer_prefs,
+    const WebPreferences& webkit_prefs,
+    SharedRenderViewCounter* counter,
+    int32 routing_id,
+    int64 session_storage_namespace_id,
+    const string16& frame_name)
     : RenderWidget(WebKit::WebPopupTypeNone),
       webkit_preferences_(webkit_prefs),
       send_content_state_immediately_(false),
@@ -476,7 +476,7 @@ void content::RenderView::ForEach(content::RenderViewVisitor* visitor) {
 RenderViewImpl* RenderViewImpl::Create(
     gfx::NativeViewId parent_hwnd,
     int32 opener_id,
-    const RendererPreferences& renderer_prefs,
+    const content::RendererPreferences& renderer_prefs,
     const WebPreferences& webkit_prefs,
     SharedRenderViewCounter* counter,
     int32 routing_id,
@@ -3774,7 +3774,7 @@ void RenderViewImpl::OnDisableScrollbarsForSmallWindows(
 }
 
 void RenderViewImpl::OnSetRendererPrefs(
-    const RendererPreferences& renderer_prefs) {
+    const content::RendererPreferences& renderer_prefs) {
   renderer_preferences_ = renderer_prefs;
   UpdateFontRenderingFromRendererPrefs();
 #if defined(TOOLKIT_USES_GTK)
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 8beea4e..e7b0f58 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -26,8 +26,8 @@
 #include "content/common/content_export.h"
 #include "content/common/edit_command.h"
 #include "content/common/navigation_gesture.h"
-#include "content/common/renderer_preferences.h"
 #include "content/public/common/page_zoom.h"
+#include "content/public/common/renderer_preferences.h"
 #include "content/public/renderer/render_view.h"
 #include "content/renderer/pepper_plugin_delegate_impl.h"
 #include "content/renderer/render_widget.h"
@@ -180,7 +180,7 @@ class RenderViewImpl : public RenderWidget,
   CONTENT_EXPORT static RenderViewImpl* Create(
       gfx::NativeViewId parent_hwnd,
       int32 opener_id,
-      const RendererPreferences& renderer_prefs,
+      const content::RendererPreferences& renderer_prefs,
       const WebPreferences& webkit_prefs,
       SharedRenderViewCounter* counter,
       int32 routing_id,
@@ -688,7 +688,7 @@ class RenderViewImpl : public RenderWidget,
 
   RenderViewImpl(gfx::NativeViewId parent_hwnd,
                  int32 opener_id,
-                 const RendererPreferences& renderer_prefs,
+                 const content::RendererPreferences& renderer_prefs,
                  const WebPreferences& webkit_prefs,
                  SharedRenderViewCounter* counter,
                  int32 routing_id,
@@ -837,7 +837,7 @@ class RenderViewImpl : public RenderWidget,
 #endif
   void OnScrollFocusedEditableNodeIntoRect(const gfx::Rect& rect);
   void OnSetPageEncoding(const std::string& encoding_name);
-  void OnSetRendererPrefs(const RendererPreferences& renderer_prefs);
+  void OnSetRendererPrefs(const content::RendererPreferences& renderer_prefs);
 #if defined(OS_MACOSX)
   void OnSetWindowVisibility(bool visible);
 #endif
@@ -948,7 +948,7 @@ class RenderViewImpl : public RenderWidget,
   // Settings ------------------------------------------------------------------
 
   WebPreferences webkit_preferences_;
-  RendererPreferences renderer_preferences_;
+  content::RendererPreferences renderer_preferences_;
 
   HostZoomLevels host_zoom_levels_;
 
diff --git a/content/renderer/render_view_linux.cc b/content/renderer/render_view_linux.cc
index cbfd254..e48ba8c 100644
--- a/content/renderer/render_view_linux.cc
+++ b/content/renderer/render_view_linux.cc
@@ -4,24 +4,24 @@
 
 #include "content/renderer/render_view_impl.h"
 
-#include "content/common/renderer_preferences.h"
+#include "content/public/common/renderer_preferences.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRendering.h"
 
 using WebKit::WebFontRendering;
 
 static SkPaint::Hinting RendererPreferencesToSkiaHinting(
-    const RendererPreferences& prefs) {
+    const content::RendererPreferences& prefs) {
   if (!prefs.should_antialias_text) {
     // When anti-aliasing is off, GTK maps all non-zero hinting settings to
     // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
     // hinting selected will see readable text in everything expect Chromium.
     switch (prefs.hinting) {
-      case RENDERER_PREFERENCES_HINTING_NONE:
+      case content::RENDERER_PREFERENCES_HINTING_NONE:
         return SkPaint::kNo_Hinting;
-      case RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT:
-      case RENDERER_PREFERENCES_HINTING_SLIGHT:
-      case RENDERER_PREFERENCES_HINTING_MEDIUM:
-      case RENDERER_PREFERENCES_HINTING_FULL:
+      case content::RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT:
+      case content::RENDERER_PREFERENCES_HINTING_SLIGHT:
+      case content::RENDERER_PREFERENCES_HINTING_MEDIUM:
+      case content::RENDERER_PREFERENCES_HINTING_FULL:
         return SkPaint::kNormal_Hinting;
       default:
         NOTREACHED();
@@ -30,15 +30,15 @@ static SkPaint::Hinting RendererPreferencesToSkiaHinting(
   }
 
   switch (prefs.hinting) {
-  case RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT:
+  case content::RENDERER_PREFERENCES_HINTING_SYSTEM_DEFAULT:
     return SkPaint::kNormal_Hinting;
-  case RENDERER_PREFERENCES_HINTING_NONE:
+  case content::RENDERER_PREFERENCES_HINTING_NONE:
     return SkPaint::kNo_Hinting;
-  case RENDERER_PREFERENCES_HINTING_SLIGHT:
+  case content::RENDERER_PREFERENCES_HINTING_SLIGHT:
     return SkPaint::kSlight_Hinting;
-  case RENDERER_PREFERENCES_HINTING_MEDIUM:
+  case content::RENDERER_PREFERENCES_HINTING_MEDIUM:
     return SkPaint::kNormal_Hinting;
-  case RENDERER_PREFERENCES_HINTING_FULL:
+  case content::RENDERER_PREFERENCES_HINTING_FULL:
     return SkPaint::kFull_Hinting;
   default:
     NOTREACHED();
@@ -47,15 +47,15 @@ static SkPaint::Hinting RendererPreferencesToSkiaHinting(
 }
 
 static SkFontHost::LCDOrder RendererPreferencesToSkiaLCDOrder(
-    RendererPreferencesSubpixelRenderingEnum subpixel) {
+    content::RendererPreferencesSubpixelRenderingEnum subpixel) {
   switch (subpixel) {
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT:
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE:
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_RGB:
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VRGB:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_RGB:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VRGB:
     return SkFontHost::kRGB_LCDOrder;
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_BGR:
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VBGR:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_BGR:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VBGR:
     return SkFontHost::kBGR_LCDOrder;
   default:
     NOTREACHED();
@@ -65,15 +65,15 @@ static SkFontHost::LCDOrder RendererPreferencesToSkiaLCDOrder(
 
 static SkFontHost::LCDOrientation
     RendererPreferencesToSkiaLCDOrientation(
-        RendererPreferencesSubpixelRenderingEnum subpixel) {
+        content::RendererPreferencesSubpixelRenderingEnum subpixel) {
   switch (subpixel) {
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT:
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE:
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_RGB:
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_BGR:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_RGB:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_BGR:
     return SkFontHost::kHorizontal_LCDOrientation;
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VRGB:
-  case RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VBGR:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VRGB:
+  case content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_VBGR:
     return SkFontHost::kVertical_LCDOrientation;
   default:
     NOTREACHED();
@@ -82,16 +82,16 @@ static SkFontHost::LCDOrientation
 }
 
 static bool RendererPreferencesToAntiAliasFlag(
-    const RendererPreferences& prefs) {
+    const content::RendererPreferences& prefs) {
   return prefs.should_antialias_text;
 }
 
 static bool RendererPreferencesToSubpixelGlyphsFlag(
-    const RendererPreferences& prefs) {
+    const content::RendererPreferences& prefs) {
   if (prefs.subpixel_rendering !=
-        RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT &&
+        content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_SYSTEM_DEFAULT &&
       prefs.subpixel_rendering !=
-        RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE) {
+        content::RENDERER_PREFERENCES_SUBPIXEL_RENDERING_NONE) {
     return true;
   }
 
@@ -99,14 +99,13 @@ static bool RendererPreferencesToSubpixelGlyphsFlag(
 }
 
 void RenderViewImpl::UpdateFontRenderingFromRendererPrefs() {
-  const RendererPreferences& prefs = renderer_preferences_;
-  WebFontRendering::setHinting(
-      RendererPreferencesToSkiaHinting(prefs));
-  WebFontRendering::setLCDOrder(
-      RendererPreferencesToSkiaLCDOrder(prefs.subpixel_rendering));
-  WebFontRendering::setLCDOrientation(
-      RendererPreferencesToSkiaLCDOrientation(prefs.subpixel_rendering));
+  const content::RendererPreferences& prefs = renderer_preferences_;
+  WebFontRendering::setHinting(RendererPreferencesToSkiaHinting(prefs));
+  WebFontRendering::setLCDOrder(RendererPreferencesToSkiaLCDOrder(
+      prefs.subpixel_rendering));
+  WebFontRendering::setLCDOrientation(RendererPreferencesToSkiaLCDOrientation(
+      prefs.subpixel_rendering));
   WebFontRendering::setAntiAlias(RendererPreferencesToAntiAliasFlag(prefs));
-  WebFontRendering::setSubpixelGlyphs(
-      RendererPreferencesToSubpixelGlyphsFlag(prefs));
+  WebFontRendering::setSubpixelGlyphs(RendererPreferencesToSubpixelGlyphsFlag(
+      prefs));
 }
diff --git a/content/test/render_view_test.cc b/content/test/render_view_test.cc
index 224733b..38df184 100644
--- a/content/test/render_view_test.cc
+++ b/content/test/render_view_test.cc
@@ -5,9 +5,9 @@
 #include "content/test/render_view_test.h"
 
 #include "content/common/dom_storage_common.h"
-#include "content/common/renderer_preferences.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/native_web_keyboard_event.h"
+#include "content/public/common/renderer_preferences.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_main_platform_delegate.h"
 #include "content/test/mock_render_process.h"
@@ -112,7 +112,7 @@ void RenderViewTest::SetUp() {
   RenderViewImpl* view = RenderViewImpl::Create(
       0,
       kOpenerId,
-      RendererPreferences(),
+      content::RendererPreferences(),
       WebPreferences(),
       new SharedRenderViewCounter(0),
       kRouteId,