12 files changed, 15 insertions, 18 deletions
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index abfaf86..8c8ffe1 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -12,8 +12,8 @@
 #include "base/file_path.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
-#include "chrome/browser/renderer_preferences.h"
 #include "chrome/common/native_web_keyboard_event.h"
+#include "chrome/common/renderer_preferences.h"
 #include "net/base/load_states.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/webpreferences.h"
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index 8bb35c9..d73db16 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -23,7 +23,6 @@
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
-#include "chrome/browser/renderer_preferences.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ -33,6 +32,7 @@
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/property_bag.h"
+#include "chrome/common/renderer_preferences.h"
 #include "net/base/load_states.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/webpreferences.h"
diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h
index 43f5cc4..496172a 100644
--- a/chrome/browser/tab_contents/tab_contents_delegate.h
+++ b/chrome/browser/tab_contents/tab_contents_delegate.h
@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/rect.h"
-#include "chrome/browser/renderer_preferences.h"
 #include "chrome/common/page_transition_types.h"
+#include "chrome/common/renderer_preferences.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class DownloadItem;
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index f3cf283..59ddaa6 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -407,6 +407,7 @@
         'common/ref_counted_util.h',
         'common/render_messages.h',
         'common/render_messages_internal.h',
+        'common/renderer_preferences.h',
         'common/resource_dispatcher.cc',
         'common/resource_dispatcher.h',
         'common/result_codes.h',
@@ -1251,7 +1252,6 @@
         'browser/renderer_host/sync_resource_handler.h',
         'browser/renderer_host/web_cache_manager.cc',
         'browser/renderer_host/web_cache_manager.h',
-        'browser/renderer_preferences.h',
         'browser/rlz/rlz.cc',
         'browser/rlz/rlz.h',
         'browser/safe_browsing/bloom_filter.cc',
@@ -2090,7 +2090,6 @@
         # But app/ is the wrong directory for them.
         # Better is to remove the dep of *_tests on renderer, but in the
         # short term I'd like the build to work.
-        'browser/renderer_preferences.h',
         'renderer/automation/dom_automation_controller.cc',
         'renderer/automation/dom_automation_controller.h',
         'renderer/extensions/bindings_utils.cc',
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 57cdcc8..63f210f 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -14,11 +14,11 @@
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "chrome/browser/renderer_host/resource_handler.h"
-#include "chrome/browser/renderer_preferences.h"
 #include "chrome/common/filter_policy.h"
 #include "chrome/common/ipc_message_utils.h"
 #include "chrome/common/modal_dialog_event.h"
 #include "chrome/common/page_transition_types.h"
+#include "chrome/common/renderer_preferences.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/common/webkit_param_traits.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/renderer_preferences.h b/chrome/common/renderer_preferences.h
index 0a4b34f..2f808ac 100644
--- a/chrome/browser/renderer_preferences.h
+++ b/chrome/common/renderer_preferences.h
@@ -9,8 +9,8 @@
 // Adding new values to this class probably involves updating
 // common/render_messages.h, browser/browser.cc, etc.
 
-#ifndef CHROME_BROWSER_RENDERER_PREFERENCES_H_
-#define CHROME_BROWSER_RENDERER_PREFERENCES_H_
+#ifndef CHROME_COMMON_RENDERER_PREFERENCES_H_
+#define CHROME_COMMON_RENDERER_PREFERENCES_H_
 
 struct RendererPreferences {
   // Whether the renderer's current browser context accept drops from the OS
@@ -22,4 +22,4 @@ struct RendererPreferences {
   }
 };
 
-#endif  // CHROME_BROWSER_RENDERER_PREFERENCES_H_
+#endif  // CHROME_COMMON_RENDERER_PREFERENCES_H_
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index a1beb11..098bbaa 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -18,6 +18,5 @@ include_rules = [
   # FIXME - refactor code and remove these dependencies
   "+chrome/browser/net",
   "+chrome/views",
-  "+chrome/browser",
 ]
 
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 2b919ac..1f72aed 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -10,11 +10,11 @@
 #include "base/command_line.h"
 #include "base/shared_memory.h"
 #include "base/stats_table.h"
-#include "chrome/browser/renderer_preferences.h"
 #include "chrome/common/app_cache/app_cache_context_impl.h"
 #include "chrome/common/app_cache/app_cache_dispatcher.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/renderer_preferences.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_util.h"
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 36cef3a..56be75e 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -12,7 +12,6 @@
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "build/build_config.h"
-#include "chrome/browser/renderer_preferences.h"
 #include "chrome/common/child_thread.h"
 #include "chrome/renderer/renderer_histogram_snapshots.h"
 
@@ -27,6 +26,7 @@ class SkBitmap;
 class UserScriptSlave;
 class VisitedLinkSlave;
 struct ModalDialogEvent;
+struct RendererPreferences;
 struct WebPreferences;
 
 // The RenderThreadBase is the minimal interface that a RenderView/Widget
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 13876ec..59155ed8 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -21,13 +21,13 @@
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
-#include "chrome/browser/renderer_preferences.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/renderer_preferences.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/about_handler.h"
@@ -194,8 +194,7 @@ RenderView::RenderView(RenderThreadBase* render_thread)
       popup_notification_visible_(false),
       delay_seconds_for_form_state_sync_(kDefaultDelaySecondsForFormStateSync),
       preferred_width_(0),
-      send_preferred_width_changes_(false),
-      renderer_preferences_(*(new RendererPreferences)) {
+      send_preferred_width_changes_(false) {
 }
 
 RenderView::~RenderView() {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index f661b02..ac315f5 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -18,7 +18,7 @@
 #include "base/timer.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/browser/renderer_preferences.h"
+#include "chrome/common/renderer_preferences.h"
 #include "chrome/renderer/automation/dom_automation_controller.h"
 #include "chrome/renderer/dom_ui_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index 0ff6793..0f31d8c5 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/test/render_view_test.h"
 
+#include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/browser/renderer_preferences.h"
-#include "chrome/browser/extensions/extension_function_dispatcher.h"
+#include "chrome/common/renderer_preferences.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"