Move RenderViewObserver and RenderViewObserverTracker to content\public\renderer and put them in the content namespace.

BUG=98716
Review URL: http://codereview.chromium.org/8124001

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

65 files changed, 142 insertions, 122 deletions

diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index 492d2ba..57e8d1a 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -50,7 +50,7 @@ namespace autofill {
 AutofillAgent::AutofillAgent(
     RenderView* render_view,
     PasswordAutofillManager* password_autofill_manager)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       password_autofill_manager_(password_autofill_manager),
       autofill_query_id_(0),
       autofill_action_(AUTOFILL_NONE),
diff --git a/chrome/renderer/autofill/autofill_agent.h b/chrome/renderer/autofill/autofill_agent.h
index 33fcb0f..2a64196 100644
--- a/chrome/renderer/autofill/autofill_agent.h
+++ b/chrome/renderer/autofill/autofill_agent.h
@@ -14,7 +14,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/renderer/autofill/form_cache.h"
 #include "chrome/renderer/page_click_listener.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 
@@ -40,7 +40,7 @@ class PasswordAutofillManager;
 // - password form fill, refered to as Password Autofill, and
 // - entire form fill based on one field entry, referred to as Form Autofill.
 
-class AutofillAgent : public RenderViewObserver,
+class AutofillAgent : public content::RenderViewObserver,
                       public PageClickListener,
                       public WebKit::WebAutofillClient {
  public:
diff --git a/chrome/renderer/autofill/password_autofill_manager.cc b/chrome/renderer/autofill/password_autofill_manager.cc
index 7277461..63fd4a3 100644
--- a/chrome/renderer/autofill/password_autofill_manager.cc
+++ b/chrome/renderer/autofill/password_autofill_manager.cc
@@ -203,7 +203,7 @@ namespace autofill {
 
 PasswordAutofillManager::PasswordAutofillManager(
     RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
diff --git a/chrome/renderer/autofill/password_autofill_manager.h b/chrome/renderer/autofill/password_autofill_manager.h
index bdaaa06..f03b8b3 100644
--- a/chrome/renderer/autofill/password_autofill_manager.h
+++ b/chrome/renderer/autofill/password_autofill_manager.h
@@ -11,7 +11,7 @@
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/renderer/page_click_listener.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "webkit/glue/password_form_dom_manager.h"
 
@@ -24,7 +24,7 @@ namespace autofill {
 
 // This class is responsible for filling password forms.
 // There is one PasswordAutofillManager per RenderView.
-class PasswordAutofillManager : public RenderViewObserver,
+class PasswordAutofillManager : public content::RenderViewObserver,
                                 public PageClickListener {
  public:
   explicit PasswordAutofillManager(RenderView* render_view);
diff --git a/chrome/renderer/automation/automation_renderer_helper.cc b/chrome/renderer/automation/automation_renderer_helper.cc
index cba167e..3eea3fd 100644
--- a/chrome/renderer/automation/automation_renderer_helper.cc
+++ b/chrome/renderer/automation/automation_renderer_helper.cc
@@ -13,7 +13,7 @@ using WebKit::WebFrame;
 using WebKit::WebURL;
 
 AutomationRendererHelper::AutomationRendererHelper(RenderView* render_view)
-    : RenderViewObserver(render_view) {
+    : content::RenderViewObserver(render_view) {
 }
 
 AutomationRendererHelper::~AutomationRendererHelper() { }
diff --git a/chrome/renderer/automation/automation_renderer_helper.h b/chrome/renderer/automation/automation_renderer_helper.h
index f601f04..9f759f6 100644
--- a/chrome/renderer/automation/automation_renderer_helper.h
+++ b/chrome/renderer/automation/automation_renderer_helper.h
@@ -6,7 +6,7 @@
 #define CHROME_RENDERER_AUTOMATION_AUTOMATION_RENDERER_HELPER_H_
 #pragma once
 
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 
 namespace WebKit {
 class WebFrame;
@@ -15,7 +15,7 @@ class WebURL;
 
 // Filters automation/testing messages sent to a |RenderView| and sends
 // automation/testing messages to the browser.
-class AutomationRendererHelper : public RenderViewObserver {
+class AutomationRendererHelper : public content::RenderViewObserver {
  public:
   explicit AutomationRendererHelper(RenderView* render_view);
   virtual ~AutomationRendererHelper();
diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc
index a2296c2..1a6a750 100644
--- a/chrome/renderer/blocked_plugin.cc
+++ b/chrome/renderer/blocked_plugin.cc
@@ -63,7 +63,7 @@ BlockedPlugin::BlockedPlugin(RenderView* render_view,
                              const string16& message,
                              bool is_blocked_for_prerendering,
                              bool allow_loading)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       frame_(frame),
       plugin_params_(params),
       is_blocked_for_prerendering_(is_blocked_for_prerendering),
diff --git a/chrome/renderer/blocked_plugin.h b/chrome/renderer/blocked_plugin.h
index cf53ec7..0d94f16 100644
--- a/chrome/renderer/blocked_plugin.h
+++ b/chrome/renderer/blocked_plugin.h
@@ -6,7 +6,7 @@
 #define CHROME_RENDERER_BLOCKED_PLUGIN_H_
 #pragma once
 
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "webkit/glue/cpp_bound_class.h"
 #include "webkit/plugins/npapi/webview_plugin.h"
@@ -23,7 +23,7 @@ namespace webkit_glue {
 struct CustomContextMenuContext;
 }
 
-class BlockedPlugin : public RenderViewObserver,
+class BlockedPlugin : public content::RenderViewObserver,
                       public CppBoundClass,
                       public webkit::npapi::WebViewPlugin::Delegate {
  public:
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc
index 444eb07..1d47627 100644
--- a/chrome/renderer/chrome_render_view_observer.cc
+++ b/chrome/renderer/chrome_render_view_observer.cc
@@ -206,7 +206,7 @@ ChromeRenderViewObserver::ChromeRenderViewObserver(
     ChromeRenderProcessObserver* chrome_render_process_observer,
     ExtensionDispatcher* extension_dispatcher,
     TranslateHelper* translate_helper)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       chrome_render_process_observer_(chrome_render_process_observer),
       extension_dispatcher_(extension_dispatcher),
       content_settings_(content_settings),
diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h
index a52c311..d09c35c 100644
--- a/chrome/renderer/chrome_render_view_observer.h
+++ b/chrome/renderer/chrome_render_view_observer.h
@@ -11,8 +11,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/render_view.h"
-#include "content/renderer/render_view_observer.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPermissionClient.h"
 
@@ -37,7 +37,7 @@ class ImageResourceFetcher;
 
 // This class holds the Chrome specific parts of RenderView, and has the same
 // lifetime.
-class ChromeRenderViewObserver : public RenderViewObserver,
+class ChromeRenderViewObserver : public content::RenderViewObserver,
                                  public WebKit::WebPermissionClient {
  public:
   // translate_helper can be NULL.
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index 8383fa4..babdf0c 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -56,8 +56,8 @@ static bool IsWhitelistedForContentSettings(WebFrame* frame) {
 ContentSettings ContentSettingsObserver::default_settings_;
 
 ContentSettingsObserver::ContentSettingsObserver(RenderView* render_view)
-    : RenderViewObserver(render_view),
-      RenderViewObserverTracker<ContentSettingsObserver>(render_view),
+    : content::RenderViewObserver(render_view),
+      content::RenderViewObserverTracker<ContentSettingsObserver>(render_view),
       plugins_temporarily_allowed_(false) {
   ClearBlockedContentSettings();
 }
diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h
index c86e10d..56e1164 100644
--- a/chrome/renderer/content_settings_observer.h
+++ b/chrome/renderer/content_settings_observer.h
@@ -9,8 +9,8 @@
 #include <map>
 
 #include "chrome/common/content_settings.h"
-#include "content/renderer/render_view_observer.h"
-#include "content/renderer/render_view_observer_tracker.h"
+#include "content/public/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer_tracker.h"
 
 class GURL;
 
@@ -21,8 +21,8 @@ class WebURL;
 
 // Handles blocking content per content settings for each RenderView.
 class ContentSettingsObserver
-    : public RenderViewObserver,
-      public RenderViewObserverTracker<ContentSettingsObserver> {
+    : public content::RenderViewObserver,
+      public content::RenderViewObserverTracker<ContentSettingsObserver> {
  public:
   explicit ContentSettingsObserver(RenderView* render_view);
   virtual ~ContentSettingsObserver();
diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
index c0f2fae..c1812cf 100644
--- a/chrome/renderer/extensions/extension_helper.cc
+++ b/chrome/renderer/extensions/extension_helper.cc
@@ -48,8 +48,8 @@ static base::LazyInstance<SchedulerMap> g_schedulers(base::LINKER_INITIALIZED);
 
 ExtensionHelper::ExtensionHelper(RenderView* render_view,
                                  ExtensionDispatcher* extension_dispatcher)
-    : RenderViewObserver(render_view),
-      RenderViewObserverTracker<ExtensionHelper>(render_view),
+    : content::RenderViewObserver(render_view),
+      content::RenderViewObserverTracker<ExtensionHelper>(render_view),
       extension_dispatcher_(extension_dispatcher),
       pending_app_icon_requests_(0),
       view_type_(ViewType::INVALID),
diff --git a/chrome/renderer/extensions/extension_helper.h b/chrome/renderer/extensions/extension_helper.h
index 4365cd8..40f6d6b 100644
--- a/chrome/renderer/extensions/extension_helper.h
+++ b/chrome/renderer/extensions/extension_helper.h
@@ -9,9 +9,9 @@
 #include <map>
 
 #include "content/common/view_types.h"
+#include "content/public/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer_tracker.h"
 #include "content/renderer/render_view.h"
-#include "content/renderer/render_view_observer.h"
-#include "content/renderer/render_view_observer_tracker.h"
 
 class ExtensionDispatcher;
 class GURL;
@@ -27,8 +27,9 @@ class ResourceFetcher;
 }
 
 // RenderView-level plumbing for extension features.
-class ExtensionHelper : public RenderViewObserver,
-                        public RenderViewObserverTracker<ExtensionHelper> {
+class ExtensionHelper
+    : public content::RenderViewObserver,
+      public content::RenderViewObserverTracker<ExtensionHelper> {
  public:
   ExtensionHelper(RenderView* render_view,
                   ExtensionDispatcher* extension_dispatcher);
diff --git a/chrome/renderer/frame_sniffer.cc b/chrome/renderer/frame_sniffer.cc
index e026b39..d4c3674 100644
--- a/chrome/renderer/frame_sniffer.cc
+++ b/chrome/renderer/frame_sniffer.cc
@@ -12,7 +12,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 
 FrameSniffer::FrameSniffer(RenderView* render_view, const string16 &frame_name)
-    : RenderViewObserver(render_view), frame_name_(frame_name) {
+    : content::RenderViewObserver(render_view), frame_name_(frame_name) {
 }
 
 FrameSniffer::~FrameSniffer() {
diff --git a/chrome/renderer/frame_sniffer.h b/chrome/renderer/frame_sniffer.h
index ae022ba..55af6d02 100644
--- a/chrome/renderer/frame_sniffer.h
+++ b/chrome/renderer/frame_sniffer.h
@@ -7,11 +7,11 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 
 // Class which observes events from the frame with specific name and sends IPC
 // messages to be handled by RenderViewHostObserver.
-class FrameSniffer : public RenderViewObserver {
+class FrameSniffer : public content::RenderViewObserver {
  public:
   FrameSniffer(RenderView* render_view, const string16 &frame_name);
   virtual ~FrameSniffer();
diff --git a/chrome/renderer/page_click_tracker.cc b/chrome/renderer/page_click_tracker.cc
index 7932397..c06cc4b 100644
--- a/chrome/renderer/page_click_tracker.cc
+++ b/chrome/renderer/page_click_tracker.cc
@@ -48,7 +48,7 @@ const WebInputElement GetTextWebInputElement(const WebNode& node) {
 }  // namespace
 
 PageClickTracker::PageClickTracker(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       was_focused_(false) {
 }
 
diff --git a/chrome/renderer/page_click_tracker.h b/chrome/renderer/page_click_tracker.h
index ac2a80d..29b3b8f 100644
--- a/chrome/renderer/page_click_tracker.h
+++ b/chrome/renderer/page_click_tracker.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEventListener.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 
@@ -28,7 +28,7 @@ class PageClickListener;
 // could easily be changed to report click on any type of WebNode.
 //
 // There is one PageClickTracker per RenderView.
-class PageClickTracker : public RenderViewObserver,
+class PageClickTracker : public content::RenderViewObserver,
                          public WebKit::WebDOMEventListener {
  public:
   explicit PageClickTracker(RenderView* render_view);
diff --git a/chrome/renderer/page_load_histograms.cc b/chrome/renderer/page_load_histograms.cc
index 147e0f8..856df40 100644
--- a/chrome/renderer/page_load_histograms.cc
+++ b/chrome/renderer/page_load_histograms.cc
@@ -85,7 +85,7 @@ enum AbandonType {
 PageLoadHistograms::PageLoadHistograms(
     RenderView* render_view,
     RendererHistogramSnapshots* histogram_snapshots)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       cross_origin_access_count_(0),
       same_origin_access_count_(0),
       histogram_snapshots_(histogram_snapshots) {
diff --git a/chrome/renderer/page_load_histograms.h b/chrome/renderer/page_load_histograms.h
index 20463fd..be7aa16 100644
--- a/chrome/renderer/page_load_histograms.h
+++ b/chrome/renderer/page_load_histograms.h
@@ -6,12 +6,12 @@
 #define CHROME_RENDERER_PAGE_LOAD_HISTOGRAMS_H_
 
 #include "base/basictypes.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 
 class NavigationState;
 class RendererHistogramSnapshots;
 
-class PageLoadHistograms : public RenderViewObserver {
+class PageLoadHistograms : public content::RenderViewObserver {
  public:
   PageLoadHistograms(RenderView* render_view,
                      RendererHistogramSnapshots* histogram_snapshots);
diff --git a/chrome/renderer/prerender/prerender_helper.cc b/chrome/renderer/prerender/prerender_helper.cc
index 4a15668..c998b25 100644
--- a/chrome/renderer/prerender/prerender_helper.cc
+++ b/chrome/renderer/prerender/prerender_helper.cc
@@ -26,8 +26,8 @@
 namespace prerender {
 
 PrerenderHelper::PrerenderHelper(RenderView* render_view)
-    : RenderViewObserver(render_view),
-      RenderViewObserverTracker<PrerenderHelper>(render_view),
+    : content::RenderViewObserver(render_view),
+      content::RenderViewObserverTracker<PrerenderHelper>(render_view),
       is_prerendering_(true),
       has_unrecorded_data_(false) {
   UpdateVisibilityState();
diff --git a/chrome/renderer/prerender/prerender_helper.h b/chrome/renderer/prerender/prerender_helper.h
index 5c2c87c..068aa36 100644
--- a/chrome/renderer/prerender/prerender_helper.h
+++ b/chrome/renderer/prerender/prerender_helper.h
@@ -8,8 +8,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/time.h"
-#include "content/renderer/render_view_observer.h"
-#include "content/renderer/render_view_observer_tracker.h"
+#include "content/public/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer_tracker.h"
 
 namespace prerender {
 
@@ -19,8 +19,9 @@ namespace prerender {
 // prerendering starts and deleted as soon as just after the prerendering
 // histograms have been recorded for a displayed prerendered page.  For
 // non-displayed pages, deleted on destruction of the RenderView.
-class PrerenderHelper : public RenderViewObserver,
-                        public RenderViewObserverTracker<PrerenderHelper> {
+class PrerenderHelper
+    : public content::RenderViewObserver,
+      public content::RenderViewObserverTracker<PrerenderHelper> {
  public:
   explicit PrerenderHelper(RenderView* render_view);
   virtual ~PrerenderHelper();
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index be463c0..7114a5d 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -490,8 +490,8 @@ void PrepareFrameAndViewForPrint::FinishPrinting() {
 }
 
 PrintWebViewHelper::PrintWebViewHelper(RenderView* render_view)
-    : RenderViewObserver(render_view),
-      RenderViewObserverTracker<PrintWebViewHelper>(render_view),
+    : content::RenderViewObserver(render_view),
+      content::RenderViewObserverTracker<PrintWebViewHelper>(render_view),
       print_web_view_(NULL),
       is_preview_(switches::IsPrintPreviewEnabled()),
       is_print_ready_metafile_sent_(false),
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index 1884f9f..3c60a17 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -11,8 +11,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/time.h"
-#include "content/renderer/render_view_observer.h"
-#include "content/renderer/render_view_observer_tracker.h"
+#include "content/public/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer_tracker.h"
 #include "printing/metafile.h"
 #include "printing/metafile_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
@@ -86,10 +86,11 @@ class PrepareFrameAndViewForPrint {
 // PrintWebViewHelper handles most of the printing grunt work for RenderView.
 // We plan on making print asynchronous and that will require copying the DOM
 // of the document and creating a new WebView with the contents.
-class PrintWebViewHelper : public RenderViewObserver,
-                           public RenderViewObserverTracker<PrintWebViewHelper>,
-                           public WebKit::WebViewClient,
-                           public WebKit::WebFrameClient {
+class PrintWebViewHelper
+    : public content::RenderViewObserver,
+      public content::RenderViewObserverTracker<PrintWebViewHelper>,
+      public WebKit::WebViewClient,
+      public WebKit::WebFrameClient {
  public:
   explicit PrintWebViewHelper(RenderView* render_view);
   virtual ~PrintWebViewHelper();
diff --git a/chrome/renderer/safe_browsing/malware_dom_details.cc b/chrome/renderer/safe_browsing/malware_dom_details.cc
index 866cae8..e488a76 100644
--- a/chrome/renderer/safe_browsing/malware_dom_details.cc
+++ b/chrome/renderer/safe_browsing/malware_dom_details.cc
@@ -28,7 +28,7 @@ MalwareDOMDetails* MalwareDOMDetails::Create(RenderView* render_view) {
 }
 
 MalwareDOMDetails::MalwareDOMDetails(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       render_view_(render_view) {
 }
 
diff --git a/chrome/renderer/safe_browsing/malware_dom_details.h b/chrome/renderer/safe_browsing/malware_dom_details.h
index 6698aff..c91cbb1 100644
--- a/chrome/renderer/safe_browsing/malware_dom_details.h
+++ b/chrome/renderer/safe_browsing/malware_dom_details.h
@@ -16,7 +16,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 
 class GURL;
 class RenderView;
@@ -31,7 +31,7 @@ struct SafeBrowsingHostMsg_MalwareDOMDetails_Node;
 namespace safe_browsing {
 
 // There is one MalwareDOMDetails per RenderView.
-class MalwareDOMDetails : public RenderViewObserver {
+class MalwareDOMDetails : public content::RenderViewObserver {
  public:
   // An upper limit on the number of nodes we collect. Not const for the test.
   static uint32 kMaxNodes;
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
index 5b2aa54..8480e91 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
@@ -85,7 +85,7 @@ PhishingClassifierDelegate* PhishingClassifierDelegate::Create(
 PhishingClassifierDelegate::PhishingClassifierDelegate(
     RenderView* render_view,
     PhishingClassifier* classifier)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       last_main_frame_transition_(PageTransition::LINK),
       have_page_text_(false),
       is_classifying_(false) {
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h
index 77a0397..4a8e7e1 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "content/common/page_transition_types.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/render_process_observer.h"
 #include "googleurl/src/gurl.h"
 
@@ -34,7 +34,7 @@ class PhishingClassifierFilter : public RenderProcessObserver {
   DISALLOW_COPY_AND_ASSIGN(PhishingClassifierFilter);
 };
 
-class PhishingClassifierDelegate : public RenderViewObserver {
+class PhishingClassifierDelegate : public content::RenderViewObserver {
  public:
   // The RenderView owns us.  This object takes ownership of the classifier.
   // Note that if classifier is null, a default instance of PhishingClassifier
diff --git a/chrome/renderer/searchbox.cc b/chrome/renderer/searchbox.cc
index 9041c1f..01fe554 100644
--- a/chrome/renderer/searchbox.cc
+++ b/chrome/renderer/searchbox.cc
@@ -12,8 +12,8 @@
 using WebKit::WebView;
 
 SearchBox::SearchBox(RenderView* render_view)
-    : RenderViewObserver(render_view),
-      RenderViewObserverTracker<SearchBox>(render_view),
+    : content::RenderViewObserver(render_view),
+      content::RenderViewObserverTracker<SearchBox>(render_view),
       verbatim_(false),
       selection_start_(0),
       selection_end_(0) {
diff --git a/chrome/renderer/searchbox.h b/chrome/renderer/searchbox.h
index b9d5f5c5..2e63e7f 100644
--- a/chrome/renderer/searchbox.h
+++ b/chrome/renderer/searchbox.h
@@ -11,12 +11,12 @@
 
 #include "base/string16.h"
 #include "chrome/common/instant_types.h"
-#include "content/renderer/render_view_observer.h"
-#include "content/renderer/render_view_observer_tracker.h"
+#include "content/public/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer_tracker.h"
 #include "ui/gfx/rect.h"
 
-class SearchBox : public RenderViewObserver,
-                  public RenderViewObserverTracker<SearchBox> {
+class SearchBox : public content::RenderViewObserver,
+                  public content::RenderViewObserverTracker<SearchBox> {
  public:
   explicit SearchBox(RenderView* render_view);
   virtual ~SearchBox();
diff --git a/chrome/renderer/spellchecker/spellcheck_provider.cc b/chrome/renderer/spellchecker/spellcheck_provider.cc
index 70d32ef..794b204 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider.cc
+++ b/chrome/renderer/spellchecker/spellcheck_provider.cc
@@ -23,7 +23,7 @@ using WebKit::WebVector;
 
 SpellCheckProvider::SpellCheckProvider(RenderView* render_view,
                                        SpellCheck* spellcheck)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
 #if defined(OS_MACOSX)
       has_document_tag_(false),
 #endif
diff --git a/chrome/renderer/spellchecker/spellcheck_provider.h b/chrome/renderer/spellchecker/spellcheck_provider.h
index 2baf848..a2b29f7 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider.h
+++ b/chrome/renderer/spellchecker/spellcheck_provider.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/id_map.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpellCheckClient.h"
 
 class RenderView;
@@ -23,7 +23,7 @@ struct WebTextCheckingResult;
 
 // This class deals with invoking browser-side spellcheck mechanism
 // which is done asynchronously.
-class SpellCheckProvider : public RenderViewObserver,
+class SpellCheckProvider : public content::RenderViewObserver,
                            public WebKit::WebSpellCheckClient {
  public:
   typedef IDMap<WebKit::WebTextCheckingCompletion> WebTextCheckCompletions;
diff --git a/chrome/renderer/translate_helper.cc b/chrome/renderer/translate_helper.cc
index 6710a9d..53708d7 100644
--- a/chrome/renderer/translate_helper.cc
+++ b/chrome/renderer/translate_helper.cc
@@ -48,7 +48,7 @@ static const char* const kAutoDetectionLanguage = "auto";
 //
 TranslateHelper::TranslateHelper(RenderView* render_view,
                                  autofill::AutofillAgent* autofill)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       translation_pending_(false),
       page_id_(-1),
       autofill_(autofill),
diff --git a/chrome/renderer/translate_helper.h b/chrome/renderer/translate_helper.h
index 902f0bc..31b8979 100644
--- a/chrome/renderer/translate_helper.h
+++ b/chrome/renderer/translate_helper.h
@@ -10,7 +10,7 @@
 
 #include "base/task.h"
 #include "chrome/common/translate_errors.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 
 namespace WebKit {
 class WebDocument;
@@ -24,7 +24,7 @@ class AutofillAgent;
 // This class deals with page translation.
 // There is one TranslateHelper per RenderView.
 
-class TranslateHelper : public RenderViewObserver {
+class TranslateHelper : public content::RenderViewObserver {
  public:
   // autofill can be NULL.
   TranslateHelper(RenderView* render_view, autofill::AutofillAgent* autofill);
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 0c6c869..7420d01 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -24,6 +24,9 @@
   ],
   'sources': [
     'public/renderer/content_renderer_client.h',
+    'public/renderer/render_view_observer.cc',
+    'public/renderer/render_view_observer.h',
+    'public/renderer/render_view_observer_tracker.h',
     'renderer/active_notification_tracker.cc',
     'renderer/active_notification_tracker.h',
     'renderer/device_orientation_dispatcher.cc',
@@ -109,9 +112,6 @@
     'renderer/render_view.cc',
     'renderer/render_view.h',
     'renderer/render_view_linux.cc',
-    'renderer/render_view_observer.cc',
-    'renderer/render_view_observer.h',
-    'renderer/render_view_observer_tracker.h',
     'renderer/render_view_selection.cc',
     'renderer/render_view_selection.h',
     'renderer/render_view_visitor.h',
diff --git a/content/public/renderer/DEPS b/content/public/renderer/DEPS
new file mode 100644
index 0000000..ad40bca
--- /dev/null
+++ b/content/public/renderer/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+content/renderer/render_view.h",
+]
diff --git a/content/renderer/render_view_observer.cc b/content/public/renderer/render_view_observer.cc
index b733caf..6668990 100644
--- a/content/renderer/render_view_observer.cc
+++ b/content/public/renderer/render_view_observer.cc
@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 
 #include "content/renderer/render_view.h"
 
 using WebKit::WebFrame;
 
+namespace content {
+
 RenderViewObserver::RenderViewObserver(RenderView* render_view)
     : render_view_(render_view),
-      routing_id_(render_view ? render_view->routing_id() : 0) {
+      routing_id_(render_view ? render_view->routing_id() : MSG_ROUTING_NONE) {
   // |render_view| can be NULL on unit testing.
   if (render_view_)
     render_view_->AddObserver(this);
@@ -36,3 +38,5 @@ bool RenderViewObserver::Send(IPC::Message* message) {
   delete message;
   return false;
 }
+
+}  // namespace content
diff --git a/content/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h
index 6f42f86..b657af9 100644
--- a/content/renderer/render_view_observer.h
+++ b/content/public/renderer/render_view_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_RENDER_VIEW_OBSERVER_H_
-#define CONTENT_RENDERER_RENDER_VIEW_OBSERVER_H_
+#ifndef CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_
+#define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -26,6 +26,8 @@ class WebURL;
 struct WebURLError;
 }
 
+namespace content {
+
 // Base class for objects that want to filter incoming IPCs, and also get
 // notified of changes to the frame.
 class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener,
@@ -89,7 +91,7 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener,
   int routing_id() { return routing_id_; }
 
  private:
-  friend class RenderView;
+  friend class ::RenderView;
 
   void set_render_view(RenderView* rv) { render_view_ = rv; }
 
@@ -100,4 +102,6 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener,
   DISALLOW_COPY_AND_ASSIGN(RenderViewObserver);
 };
 
-#endif  // CONTENT_RENDERER_RENDER_VIEW_OBSERVER_H_
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_H_
diff --git a/content/renderer/render_view_observer_tracker.h b/content/public/renderer/render_view_observer_tracker.h
index 4029931..5f719d1 100644
--- a/content/renderer/render_view_observer_tracker.h
+++ b/content/public/renderer/render_view_observer_tracker.h
@@ -13,7 +13,7 @@
 //
 //   MyRVO::MyRVO(RenderView* render_view)
 //       : RenderViewObserver(render_view),
-//         RenderViewObserverTracker<SearchBox>(render_view) {
+//         RenderViewObserverTracker<MyRVO>(render_view) {
 //     ...
 //   }
 //
@@ -23,8 +23,8 @@
 //    // my_rvo == my_rvo_tracked
 //  }
 
-#ifndef CONTENT_RENDERER_RENDER_VIEW_OBSERVER_TRACKER_H_
-#define CONTENT_RENDERER_RENDER_VIEW_OBSERVER_TRACKER_H_
+#ifndef CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_TRACKER_H_
+#define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_TRACKER_H_
 #pragma once
 
 #include <map>
@@ -33,6 +33,8 @@
 
 class RenderView;
 
+namespace content {
+
 template <class T>
 class RenderViewObserverTracker {
  public:
@@ -61,4 +63,6 @@ template <class T>
 base::LazyInstance<std::map<const RenderView*, T*> >
     RenderViewObserverTracker<T>::render_view_map_(base::LINKER_INITIALIZED);
 
-#endif  // CONTENT_RENDERER_RENDER_VIEW_OBSERVER_TRACKER_H_
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_RENDERER_RENDER_VIEW_OBSERVER_TRACKER_H_
diff --git a/content/renderer/device_orientation_dispatcher.cc b/content/renderer/device_orientation_dispatcher.cc
index 0ffe827..c6c9d60 100644
--- a/content/renderer/device_orientation_dispatcher.cc
+++ b/content/renderer/device_orientation_dispatcher.cc
@@ -10,7 +10,7 @@
 
 DeviceOrientationDispatcher::DeviceOrientationDispatcher(
     RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       controller_(NULL),
       started_(false) {
 }
diff --git a/content/renderer/device_orientation_dispatcher.h b/content/renderer/device_orientation_dispatcher.h
index 895e458..4dd783c 100644
--- a/content/renderer/device_orientation_dispatcher.h
+++ b/content/renderer/device_orientation_dispatcher.h
@@ -8,7 +8,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClient.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 
 namespace WebKit {
 class WebDeviceOrientation;
@@ -16,7 +16,7 @@ class WebDeviceOrientation;
 
 struct DeviceOrientationMsg_Updated_Params;
 
-class DeviceOrientationDispatcher : public RenderViewObserver,
+class DeviceOrientationDispatcher : public content::RenderViewObserver,
                                     public WebKit::WebDeviceOrientationClient {
  public:
   explicit DeviceOrientationDispatcher(RenderView* render_view);
diff --git a/content/renderer/devtools_agent.cc b/content/renderer/devtools_agent.cc
index bafcc8d..c9a27bb 100644
--- a/content/renderer/devtools_agent.cc
+++ b/content/renderer/devtools_agent.cc
@@ -57,7 +57,7 @@ class WebKitClientMessageLoopImpl
 std::map<int, DevToolsAgent*> DevToolsAgent::agent_for_routing_id_;
 
 DevToolsAgent::DevToolsAgent(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       is_attached_(false) {
   agent_for_routing_id_[routing_id()] = this;
 
diff --git a/content/renderer/devtools_agent.h b/content/renderer/devtools_agent.h
index 8c8dd78..64d6254 100644
--- a/content/renderer/devtools_agent.h
+++ b/content/renderer/devtools_agent.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgentClient.h"
 
 namespace WebKit {
@@ -25,7 +25,7 @@ typedef std::map<std::string, std::string> DevToolsRuntimeProperties;
 // agents with the communication capabilities. All messages from/to Glue's
 // agents infrastructure are flowing through this communication agent.
 // There is a corresponding DevToolsClient object on the client side.
-class DevToolsAgent : public RenderViewObserver,
+class DevToolsAgent : public content::RenderViewObserver,
                       public WebKit::WebDevToolsAgentClient {
  public:
   explicit DevToolsAgent(RenderView* render_view);
diff --git a/content/renderer/devtools_client.cc b/content/renderer/devtools_client.cc
index cdebbba..2d657e6 100644
--- a/content/renderer/devtools_client.cc
+++ b/content/renderer/devtools_client.cc
@@ -19,7 +19,7 @@ using WebKit::WebDevToolsFrontend;
 using WebKit::WebString;
 
 DevToolsClient::DevToolsClient(RenderView* render_view)
-    : RenderViewObserver(render_view) {
+    : content::RenderViewObserver(render_view) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   web_tools_frontend_.reset(
       WebDevToolsFrontend::create(
diff --git a/content/renderer/devtools_client.h b/content/renderer/devtools_client.h
index d00d33f..f9c2da2 100644
--- a/content/renderer/devtools_client.h
+++ b/content/renderer/devtools_client.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h"
 
 class MessageLoop;
@@ -28,7 +28,7 @@ struct DevToolsMessageData;
 // corresponding DevToolsAgent object.
 // TODO(yurys): now the client is almost empty later it will delegate calls to
 // code in glue
-class DevToolsClient : public RenderViewObserver,
+class DevToolsClient : public content::RenderViewObserver,
                        public WebKit::WebDevToolsFrontendClient {
  public:
   explicit DevToolsClient(RenderView* render_view);
diff --git a/content/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc
index f4eeae9..ae457c2 100644
--- a/content/renderer/geolocation_dispatcher.cc
+++ b/content/renderer/geolocation_dispatcher.cc
@@ -20,7 +20,7 @@ using WebKit::WebGeolocationPermissionRequestManager;
 using WebKit::WebGeolocationPosition;
 
 GeolocationDispatcher::GeolocationDispatcher(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       pending_permissions_(new WebGeolocationPermissionRequestManager()),
       enable_high_accuracy_(false),
       updating_(false) {
diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h
index 24c267b..4ca8570 100644
--- a/content/renderer/geolocation_dispatcher.h
+++ b/content/renderer/geolocation_dispatcher.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationController.h"
 
@@ -24,7 +24,7 @@ class WebSecurityOrigin;
 // GeolocationDispatcher is a delegate for Geolocation messages used by
 // WebKit.
 // It's the complement of GeolocationDispatcherHost (owned by RenderViewHost).
-class GeolocationDispatcher : public RenderViewObserver,
+class GeolocationDispatcher : public content::RenderViewObserver,
                               public WebKit::WebGeolocationClient {
  public:
   explicit GeolocationDispatcher(RenderView* render_view);
diff --git a/content/renderer/intents_dispatcher.cc b/content/renderer/intents_dispatcher.cc
index aa174cf..da74b94 100644
--- a/content/renderer/intents_dispatcher.cc
+++ b/content/renderer/intents_dispatcher.cc
@@ -119,7 +119,7 @@ class IntentsDispatcher::BoundDeliveredIntent : public CppBoundClass {
 };
 
 IntentsDispatcher::IntentsDispatcher(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       intent_id_(0) {
 }
 
diff --git a/content/renderer/intents_dispatcher.h b/content/renderer/intents_dispatcher.h
index 8a5eb07..8a504fb 100644
--- a/content/renderer/intents_dispatcher.h
+++ b/content/renderer/intents_dispatcher.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 
 namespace webkit_glue {
@@ -21,7 +21,7 @@ class WebFrame;
 // IntentsDispatcher is a delegate for Web Intents messages. It is the
 // renderer-side handler for IPC messages delivering the intent payload data
 // and preparing it for access by the service page.
-class IntentsDispatcher : public RenderViewObserver {
+class IntentsDispatcher : public content::RenderViewObserver {
  public:
   // |render_view| must not be NULL.
   explicit IntentsDispatcher(RenderView* render_view);
diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc
index 7482ac2..6192ed8 100644
--- a/content/renderer/media/media_stream_dispatcher.cc
+++ b/content/renderer/media/media_stream_dispatcher.cc
@@ -11,7 +11,7 @@
 MediaStreamDispatcherEventHandler::~MediaStreamDispatcherEventHandler() {}
 
 MediaStreamDispatcher::MediaStreamDispatcher(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       next_ipc_id_(0) {
 }
 
diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h
index deb543c..a599abc 100644
--- a/content/renderer/media/media_stream_dispatcher.h
+++ b/content/renderer/media/media_stream_dispatcher.h
@@ -13,15 +13,16 @@
 #include "base/message_loop.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
-#include "content/renderer/render_view_observer.h"
 
 // MediaStreamDispatcher is a delegate for the Media Stream API messages.
 // MediaStreams are used by WebKit to open media devices such as Video Capture
 // and Audio input devices.
 // It's the complement of MediaStreamDispatcherHost (owned by
 // BrowserRenderProcessHost).
-class CONTENT_EXPORT MediaStreamDispatcher : public RenderViewObserver {
+class CONTENT_EXPORT MediaStreamDispatcher
+    : public content::RenderViewObserver {
  public:
   explicit MediaStreamDispatcher(RenderView* render_view);
   virtual ~MediaStreamDispatcher();
diff --git a/content/renderer/mhtml_generator.cc b/content/renderer/mhtml_generator.cc
index 6c5f262..9bfadaf 100644
--- a/content/renderer/mhtml_generator.cc
+++ b/content/renderer/mhtml_generator.cc
@@ -11,7 +11,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h"
 
 MHTMLGenerator::MHTMLGenerator(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       file_(base::kInvalidPlatformFileValue) {
 }
 
diff --git a/content/renderer/mhtml_generator.h b/content/renderer/mhtml_generator.h
index 96c2a8a..f2e1c36 100644
--- a/content/renderer/mhtml_generator.h
+++ b/content/renderer/mhtml_generator.h
@@ -5,11 +5,11 @@
 #ifndef CONTENT_RENDERER_MHTML_GENERATOR_H_
 #define CONTENT_RENDERER_MHTML_GENERATOR_H_
 
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 
 #include "ipc/ipc_platform_file.h"
 
-class MHTMLGenerator : public RenderViewObserver {
+class MHTMLGenerator : public content::RenderViewObserver {
  public:
   explicit MHTMLGenerator(RenderView* render_view);
   virtual ~MHTMLGenerator();
diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc
index 4cc04b7..1fe71e0 100644
--- a/content/renderer/notification_provider.cc
+++ b/content/renderer/notification_provider.cc
@@ -25,7 +25,7 @@ using WebKit::WebString;
 using WebKit::WebURL;
 
 NotificationProvider::NotificationProvider(RenderView* render_view)
-    : RenderViewObserver(render_view) {
+    : content::RenderViewObserver(render_view) {
 }
 
 NotificationProvider::~NotificationProvider() {
diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h
index 0feddb6..4c8ed24 100644
--- a/content/renderer/notification_provider.h
+++ b/content/renderer/notification_provider.h
@@ -6,8 +6,8 @@
 #define CONTENT_RENDERER_NOTIFICATION_PROVIDER_H_
 #pragma once
 
+#include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/active_notification_tracker.h"
-#include "content/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
 
@@ -17,7 +17,7 @@ class WebNotificationPermissionCallback;
 
 // NotificationProvider class is owned by the RenderView.  Only
 // to be used on the main thread.
-class NotificationProvider : public RenderViewObserver,
+class NotificationProvider : public content::RenderViewObserver,
                              public WebKit::WebNotificationPresenter {
  public:
   explicit NotificationProvider(RenderView* render_view);
diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc
index c2a5d23..842f848 100644
--- a/content/renderer/p2p/socket_dispatcher.cc
+++ b/content/renderer/p2p/socket_dispatcher.cc
@@ -12,7 +12,7 @@
 namespace content {
 
 P2PSocketDispatcher::P2PSocketDispatcher(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       message_loop_(base::MessageLoopProxy::current()),
       network_notifications_started_(false),
       network_list_observers_(
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index 46b572a..38ddd3e 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -27,7 +27,7 @@
 #include "base/observer_list_threadsafe.h"
 #include "base/synchronization/lock.h"
 #include "content/common/p2p_sockets.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "net/base/net_util.h"
 
 namespace base {
@@ -46,7 +46,7 @@ class P2PSocketClient;
 // P2PSocketDispatcher works on the renderer thread. It dispatches all
 // messages on that thread, and all its methods must be called on the
 // same thread.
-class P2PSocketDispatcher : public RenderViewObserver {
+class P2PSocketDispatcher : public content::RenderViewObserver {
  public:
   class NetworkListObserver {
    public:
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 91d9c2d..52c6ca4 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -42,6 +42,7 @@
 #include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/content_renderer_client.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/devtools_agent.h"
 #include "content/renderer/external_popup_menu.h"
@@ -60,7 +61,6 @@
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread.h"
-#include "content/renderer/render_view_observer.h"
 #include "content/renderer/render_view_visitor.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/renderer_accessibility.h"
@@ -237,6 +237,7 @@ using WebKit::WebWorkerClient;
 using appcache::WebApplicationCacheHostImpl;
 using base::Time;
 using base::TimeDelta;
+using content::RenderViewObserver;
 using webkit_glue::AltErrorPageResourceFetcher;
 using webkit_glue::FormField;
 using webkit_glue::PasswordForm;
diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h
index 31a3141..81b21e4 100644
--- a/content/renderer/render_view.h
+++ b/content/renderer/render_view.h
@@ -67,7 +67,6 @@ class NavigationState;
 class NotificationProvider;
 class PepperDeviceTest;
 class PrintWebViewHelper;
-class RenderViewObserver;
 class RenderViewVisitor;
 class RenderWidgetFullscreenPepper;
 class RendererAccessibility;
@@ -89,6 +88,7 @@ class WaitableEvent;
 
 namespace content {
 class P2PSocketDispatcher;
+class RenderViewObserver;
 }  // namespace content
 
 namespace gfx {
@@ -239,8 +239,8 @@ class RenderView : public RenderWidget,
   }
 
   // Functions to add and remove observers for this object.
-  void AddObserver(RenderViewObserver* observer);
-  void RemoveObserver(RenderViewObserver* observer);
+  void AddObserver(content::RenderViewObserver* observer);
+  void RemoveObserver(content::RenderViewObserver* observer);
 
   // Evaluates a string of JavaScript in a particular frame.
   CONTENT_EXPORT void EvaluateScript(const string16& frame_xpath,
@@ -1215,7 +1215,7 @@ class RenderView : public RenderWidget,
 
   // All the registered observers.  We expect this list to be small, so vector
   // is fine.
-  ObserverList<RenderViewObserver> observers_;
+  ObserverList<content::RenderViewObserver> observers_;
 
   // Used to inform didChangeSelection() when it is called in the context
   // of handling a ViewMsg_SelectRange IPC.
diff --git a/content/renderer/renderer_accessibility.cc b/content/renderer/renderer_accessibility.cc
index 0d20220..bdf3346 100644
--- a/content/renderer/renderer_accessibility.cc
+++ b/content/renderer/renderer_accessibility.cc
@@ -78,7 +78,7 @@ bool WebAccessibilityNotificationToViewHostMsg(
 }
 
 RendererAccessibility::RendererAccessibility(RenderView* render_view)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       browser_root_(NULL),
       ack_pending_(false),
diff --git a/content/renderer/renderer_accessibility.h b/content/renderer/renderer_accessibility.h
index 751ce89..9535632 100644
--- a/content/renderer/renderer_accessibility.h
+++ b/content/renderer/renderer_accessibility.h
@@ -10,7 +10,7 @@
 
 #include "base/hash_tables.h"
 #include "base/task.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h"
 
 namespace WebKit {
@@ -28,7 +28,7 @@ struct WebAccessibility;
 // the renderer to the browser and sending updates whenever it changes, and
 // handling requests from the browser to perform accessibility actions on
 // nodes in the tree (e.g., change focus, or click on a button).
-class RendererAccessibility : public RenderViewObserver {
+class RendererAccessibility : public content::RenderViewObserver {
  public:
   RendererAccessibility(RenderView* render_view);
   virtual ~RendererAccessibility();
diff --git a/content/renderer/speech_input_dispatcher.cc b/content/renderer/speech_input_dispatcher.cc
index 96ab209..305521d 100644
--- a/content/renderer/speech_input_dispatcher.cc
+++ b/content/renderer/speech_input_dispatcher.cc
@@ -28,7 +28,7 @@ using WebKit::WebView;
 SpeechInputDispatcher::SpeechInputDispatcher(
     RenderView* render_view,
     WebKit::WebSpeechInputListener* listener)
-    : RenderViewObserver(render_view),
+    : content::RenderViewObserver(render_view),
       listener_(listener) {
 }
 
diff --git a/content/renderer/speech_input_dispatcher.h b/content/renderer/speech_input_dispatcher.h
index 6d44c3a..9ecb180 100644
--- a/content/renderer/speech_input_dispatcher.h
+++ b/content/renderer/speech_input_dispatcher.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "content/common/speech_input_result.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputController.h"
 
 class GURL;
@@ -18,7 +18,7 @@ class WebSpeechInputListener;
 
 // SpeechInputDispatcher is a delegate for speech input messages used by WebKit.
 // It's the complement of SpeechInputDispatcherHost (owned by RenderViewHost).
-class SpeechInputDispatcher : public RenderViewObserver,
+class SpeechInputDispatcher : public content::RenderViewObserver,
                               public WebKit::WebSpeechInputController {
  public:
   SpeechInputDispatcher(RenderView* render_view,
diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc
index f89623c..b4b5b9e 100644
--- a/content/renderer/text_input_client_observer.cc
+++ b/content/renderer/text_input_client_observer.cc
@@ -17,7 +17,7 @@
 #include "ui/gfx/rect.h"
 
 TextInputClientObserver::TextInputClientObserver(RenderView* render_view)
-    : RenderViewObserver(render_view) {
+    : content::RenderViewObserver(render_view) {
 }
 
 TextInputClientObserver::~TextInputClientObserver() {
diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h
index 7cd1fc1..e9c20cc 100644
--- a/content/renderer/text_input_client_observer.h
+++ b/content/renderer/text_input_client_observer.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
-#include "content/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/point.h"
 
@@ -18,7 +18,7 @@ class WebView;
 // This is the renderer-side message filter that generates the replies for the
 // messages sent by the TextInputClientMac. See
 // content/browser/renderer_host/text_input_client_mac.h for more information.
-class TextInputClientObserver : public RenderViewObserver {
+class TextInputClientObserver : public content::RenderViewObserver {
  public:
   explicit TextInputClientObserver(RenderView* render_view);
   virtual ~TextInputClientObserver();