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

29 files changed, 43 insertions, 246 deletions

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/render_view_observer.cc b/content/renderer/render_view_observer.cc
deleted file mode 100644
index b733caf..0000000
--- a/content/renderer/render_view_observer.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// 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/renderer/render_view.h"
-
-using WebKit::WebFrame;
-
-RenderViewObserver::RenderViewObserver(RenderView* render_view)
-    : render_view_(render_view),
-      routing_id_(render_view ? render_view->routing_id() : 0) {
-  // |render_view| can be NULL on unit testing.
-  if (render_view_)
-    render_view_->AddObserver(this);
-}
-
-RenderViewObserver::~RenderViewObserver() {
-  if (render_view_)
-    render_view_->RemoveObserver(this);
-}
-
-void RenderViewObserver::OnDestruct() {
-  delete this;
-}
-
-bool RenderViewObserver::OnMessageReceived(const IPC::Message& message) {
-  return false;
-}
-
-bool RenderViewObserver::Send(IPC::Message* message) {
-  if (render_view_)
-    return render_view_->Send(message);
-
-  delete message;
-  return false;
-}
diff --git a/content/renderer/render_view_observer.h b/content/renderer/render_view_observer.h
deleted file mode 100644
index 6f42f86..0000000
--- a/content/renderer/render_view_observer.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// 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_
-#pragma once
-
-#include "base/basictypes.h"
-#include "content/common/content_export.h"
-#include "ipc/ipc_channel.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h"
-
-class RenderView;
-
-namespace WebKit {
-class WebDataSource;
-class WebFrame;
-class WebFormElement;
-class WebMediaPlayerClient;
-class WebMouseEvent;
-class WebNode;
-class WebString;
-class WebTouchEvent;
-class WebURL;
-struct WebURLError;
-}
-
-// 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,
-                                          public IPC::Message::Sender {
- public:
-  // By default, observers will be deleted when the RenderView goes away.  If
-  // they want to outlive it, they can override this function.
-  virtual void OnDestruct();
-
-  // These match the WebKit API notifications
-  virtual void DidStartLoading() {}
-  virtual void DidStopLoading() {}
-  virtual void DidChangeIcon(WebKit::WebFrame* frame,
-                             WebKit::WebIconURL::Type) {}
-  virtual void DidFinishDocumentLoad(WebKit::WebFrame* frame) {}
-  virtual void DidFailLoad(WebKit::WebFrame* frame,
-                           const WebKit::WebURLError& error) {}
-  virtual void DidFinishLoad(WebKit::WebFrame* frame) {}
-  virtual void DidStartProvisionalLoad(WebKit::WebFrame* frame) {}
-  virtual void DidFailProvisionalLoad(WebKit::WebFrame* frame,
-                                      const WebKit::WebURLError& error) {}
-  virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
-                                        bool is_new_navigation) {}
-  virtual void DidClearWindowObject(WebKit::WebFrame* frame) {}
-  virtual void WillPerformClientRedirect(
-      WebKit::WebFrame* frame, const WebKit::WebURL& from,
-      const WebKit::WebURL& to, double interval, double fire_time) {}
-  virtual void DidCancelClientRedirect(WebKit::WebFrame* frame) {}
-  virtual void DidCompleteClientRedirect(WebKit::WebFrame* frame,
-                                         const WebKit::WebURL& from) {}
-  virtual void DidCreateDocumentElement(WebKit::WebFrame* frame) {}
-  virtual void FrameDetached(WebKit::WebFrame* frame) {}
-  virtual void FrameWillClose(WebKit::WebFrame* frame) {}
-  virtual void WillSubmitForm(WebKit::WebFrame* frame,
-                              const WebKit::WebFormElement& form) {}
-  virtual void DidCreateDataSource(WebKit::WebFrame* frame,
-                                   WebKit::WebDataSource* ds) {}
-  virtual void PrintPage(WebKit::WebFrame* frame) {}
-  virtual void FocusedNodeChanged(const WebKit::WebNode& node) {}
-
-  // These match the RenderView methods.
-  virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event) {}
-  virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) {}
-
-  virtual void WillCreateMediaPlayer(WebKit::WebFrame* frame,
-                                     WebKit::WebMediaPlayerClient* client) {}
-  virtual void ContextMenuAction(unsigned id) {}
-  virtual void Navigate(const GURL& url) {}
-
- protected:
-  explicit RenderViewObserver(RenderView* render_view);
-  virtual ~RenderViewObserver();
-
-  // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-
-  // IPC::Message::Sender implementation.
-  virtual bool Send(IPC::Message* message);
-
-  RenderView* render_view() { return render_view_; }
-  int routing_id() { return routing_id_; }
-
- private:
-  friend class RenderView;
-
-  void set_render_view(RenderView* rv) { render_view_ = rv; }
-
-  RenderView* render_view_;
-  // The routing ID of the associated RenderView.
-  int routing_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderViewObserver);
-};
-
-#endif  // CONTENT_RENDERER_RENDER_VIEW_OBSERVER_H_
diff --git a/content/renderer/render_view_observer_tracker.h b/content/renderer/render_view_observer_tracker.h
deleted file mode 100644
index 4029931..0000000
--- a/content/renderer/render_view_observer_tracker.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Helper class used to find the RenderViewObservers for a given RenderView.
-//
-// Example usage:
-//
-//   class MyRVO : public RenderViewObserver,
-//                 public RenderViewObserverTracker<MyRVO> {
-//     ...
-//   };
-//
-//   MyRVO::MyRVO(RenderView* render_view)
-//       : RenderViewObserver(render_view),
-//         RenderViewObserverTracker<SearchBox>(render_view) {
-//     ...
-//   }
-//
-//  void SomeFunction(RenderView* rv) {
-//    MyRVO* my_rvo = new MyRVO(rv);
-//    MyRVO* my_rvo_tracked = MyRVO::Get(rv);
-//    // my_rvo == my_rvo_tracked
-//  }
-
-#ifndef CONTENT_RENDERER_RENDER_VIEW_OBSERVER_TRACKER_H_
-#define CONTENT_RENDERER_RENDER_VIEW_OBSERVER_TRACKER_H_
-#pragma once
-
-#include <map>
-
-#include "base/lazy_instance.h"
-
-class RenderView;
-
-template <class T>
-class RenderViewObserverTracker {
- public:
-  static T* Get(const RenderView* render_view) {
-    return render_view_map_.Get()[render_view];
-  }
-
-  explicit RenderViewObserverTracker(const RenderView* render_view)
-      : render_view_(render_view) {
-    render_view_map_.Get()[render_view] = static_cast<T*>(this);
-  }
-  ~RenderViewObserverTracker() {
-    render_view_map_.Get().erase(render_view_);
-  }
-
- private:
-  const RenderView* render_view_;
-
-  static base::LazyInstance<std::map<const RenderView*, T*> >
-    render_view_map_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderViewObserverTracker<T>);
-};
-
-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_
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();