Move RenderProcessObserver and RenderViewVisitor to content\public\renderer and put them in the content namespace.

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

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

20 files changed, 92 insertions, 95 deletions

diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index ad41476..6617b0b 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -23,9 +23,9 @@
 #include "content/common/resource_dispatcher.h"
 #include "content/common/resource_dispatcher_delegate.h"
 #include "content/common/view_messages.h"
+#include "content/public/renderer/render_view_visitor.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
-#include "content/renderer/render_view_visitor.h"
 #include "crypto/nss_util.h"
 #include "media/base/media.h"
 #include "media/base/media_switches.h"
@@ -107,7 +107,7 @@ class RendererResourceDelegate : public ResourceDispatcherDelegate {
   DISALLOW_COPY_AND_ASSIGN(RendererResourceDelegate);
 };
 
-class RenderViewContentSettingsSetter : public RenderViewVisitor {
+class RenderViewContentSettingsSetter : public content::RenderViewVisitor {
  public:
   RenderViewContentSettingsSetter(const GURL& url,
                                   const ContentSettings& content_settings)
@@ -326,7 +326,7 @@ void ChromeRenderProcessObserver::OnClearCache(bool on_navigation) {
 void ChromeRenderProcessObserver::OnGetCacheResourceStats() {
   WebCache::ResourceTypeStats stats;
   WebCache::getResourceTypeStats(&stats);
-  Send(new ChromeViewHostMsg_ResourceTypeStats(stats));
+  RenderThread::current()->Send(new ChromeViewHostMsg_ResourceTypeStats(stats));
 }
 
 #if defined(USE_TCMALLOC)
@@ -335,7 +335,7 @@ void ChromeRenderProcessObserver::OnGetRendererTcmalloc() {
   char buffer[1024 * 32];
   MallocExtension::instance()->GetStats(buffer, sizeof(buffer));
   result.append(buffer);
-  Send(new ChromeViewHostMsg_RendererTcmalloc(result));
+  RenderThread::current()->Send(new ChromeViewHostMsg_RendererTcmalloc(result));
 }
 
 void ChromeRenderProcessObserver::OnSetTcmallocHeapProfiling(
@@ -364,7 +364,8 @@ void ChromeRenderProcessObserver::OnWriteTcmallocHeapProfile(
   // a string and pass it to the handler (which runs on the browser host).
   std::string result(profile);
   delete profile;
-  Send(new ChromeViewHostMsg_WriteTcmallocHeapProfile_ACK(filename, result));
+  RenderThread::current()->Send(
+      new ChromeViewHostMsg_WriteTcmallocHeapProfile_ACK(filename, result));
 #endif
 }
 
@@ -379,8 +380,8 @@ void ChromeRenderProcessObserver::OnSetFieldTrialGroup(
 void ChromeRenderProcessObserver::OnGetV8HeapStats() {
   v8::HeapStatistics heap_stats;
   v8::V8::GetHeapStatistics(&heap_stats);
-  Send(new ChromeViewHostMsg_V8HeapStats(heap_stats.total_heap_size(),
-                                         heap_stats.used_heap_size()));
+  RenderThread::current()->Send(new ChromeViewHostMsg_V8HeapStats(
+      heap_stats.total_heap_size(), heap_stats.used_heap_size()));
 }
 
 void ChromeRenderProcessObserver::OnPurgeMemory() {
diff --git a/chrome/renderer/chrome_render_process_observer.h b/chrome/renderer/chrome_render_process_observer.h
index 615b6c3..b7740e6 100644
--- a/chrome/renderer/chrome_render_process_observer.h
+++ b/chrome/renderer/chrome_render_process_observer.h
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/renderer/render_process_observer.h"
+#include "content/public/renderer/render_process_observer.h"
 
 namespace chrome {
 class ChromeContentRendererClient;
@@ -25,7 +25,7 @@ struct ContentSettings;
 // a RenderView) for Chrome specific messages that the content layer doesn't
 // happen.  If a few messages are related, they should probably have their own
 // observer.
-class ChromeRenderProcessObserver : public RenderProcessObserver {
+class ChromeRenderProcessObserver : public content::RenderProcessObserver {
  public:
   explicit ChromeRenderProcessObserver(
       chrome::ChromeContentRendererClient* client);
diff --git a/chrome/renderer/extensions/extension_dispatcher.h b/chrome/renderer/extensions/extension_dispatcher.h
index b50b012..e1ead15 100644
--- a/chrome/renderer/extensions/extension_dispatcher.h
+++ b/chrome/renderer/extensions/extension_dispatcher.h
@@ -12,7 +12,7 @@
 
 #include "base/shared_memory.h"
 #include "base/timer.h"
-#include "content/renderer/render_process_observer.h"
+#include "content/public/renderer/render_process_observer.h"
 #include "chrome/common/extensions/extension_set.h"
 
 class GURL;
@@ -36,7 +36,7 @@ class Extension;
 
 // Dispatches extension control messages sent to the renderer and stores
 // renderer extension related state.
-class ExtensionDispatcher : public RenderProcessObserver {
+class ExtensionDispatcher : public content::RenderProcessObserver {
  public:
   ExtensionDispatcher();
   virtual ~ExtensionDispatcher();
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 1ab49f8..f525592 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -25,6 +25,7 @@
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/renderer/render_view_visitor.h"
 #include "chrome/renderer/chrome_render_process_observer.h"
 #include "chrome/renderer/extensions/chrome_v8_extension.h"
 #include "chrome/renderer/extensions/event_bindings.h"
@@ -35,7 +36,6 @@
 #include "chrome/renderer/extensions/user_script_slave.h"
 #include "chrome/renderer/static_v8_external_string_resource.h"
 #include "content/renderer/render_view.h"
-#include "content/renderer/render_view_visitor.h"
 #include "grit/common_resources.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlob.h"
@@ -78,7 +78,7 @@ base::LazyInstance<PendingRequestMap> g_pending_requests(
 // views, looking for a view of the given type, in the given browser window
 // and within the given extension.
 // Used to accumulate the list of views associated with an extension.
-class ExtensionViewAccumulator : public RenderViewVisitor {
+class ExtensionViewAccumulator : public content::RenderViewVisitor {
  public:
   ExtensionViewAccumulator(const std::string& extension_id,
                            int browser_window_id,
diff --git a/chrome/renderer/renderer_histogram_snapshots.h b/chrome/renderer/renderer_histogram_snapshots.h
index 2602276..839d3ff 100644
--- a/chrome/renderer/renderer_histogram_snapshots.h
+++ b/chrome/renderer/renderer_histogram_snapshots.h
@@ -15,10 +15,10 @@
 #include "base/process.h"
 #include "base/task.h"
 #include "chrome/common/metrics_helpers.h"
-#include "content/renderer/render_process_observer.h"
+#include "content/public/renderer/render_process_observer.h"
 
 class RendererHistogramSnapshots : public HistogramSender,
-                                   public RenderProcessObserver {
+                                   public content::RenderProcessObserver {
  public:
   RendererHistogramSnapshots();
   virtual ~RendererHistogramSnapshots();
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
index 8480e91..39b3995 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
@@ -201,7 +201,7 @@ void PhishingClassifierDelegate::ClassificationDone(
           << " score = " << verdict.client_score();
   if (verdict.client_score() != PhishingClassifier::kInvalidScore) {
     DCHECK_EQ(last_url_sent_to_classifier_.spec(), verdict.url());
-    Send(new SafeBrowsingHostMsg_PhishingDetectionDone(
+    RenderThread::current()->Send(new SafeBrowsingHostMsg_PhishingDetectionDone(
         routing_id(), verdict.SerializeAsString()));
   }
 }
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h
index 4a8e7e1..57254d2 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.h
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.h
@@ -11,8 +11,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "content/common/page_transition_types.h"
+#include "content/public/renderer/render_process_observer.h"
 #include "content/public/renderer/render_view_observer.h"
-#include "content/renderer/render_process_observer.h"
 #include "googleurl/src/gurl.h"
 
 namespace safe_browsing {
@@ -20,7 +20,7 @@ class ClientPhishingRequest;
 class PhishingClassifier;
 class Scorer;
 
-class PhishingClassifierFilter : public RenderProcessObserver {
+class PhishingClassifierFilter : public content::RenderProcessObserver {
  public:
   static PhishingClassifierFilter* Create();
   virtual ~PhishingClassifierFilter();
diff --git a/chrome/renderer/safe_browsing/render_view_fake_resources_test.h b/chrome/renderer/safe_browsing/render_view_fake_resources_test.h
index c3a9767..93fd006 100644
--- a/chrome/renderer/safe_browsing/render_view_fake_resources_test.h
+++ b/chrome/renderer/safe_browsing/render_view_fake_resources_test.h
@@ -48,7 +48,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
-#include "content/renderer/render_view_visitor.h"
+#include "content/public/renderer/render_view_visitor.h"
 #include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -70,7 +70,7 @@ namespace safe_browsing {
 
 class RenderViewFakeResourcesTest : public ::testing::Test,
                                     public IPC::Channel::Listener,
-                                    public RenderViewVisitor {
+                                    public content::RenderViewVisitor {
  public:
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
diff --git a/chrome/renderer/spellchecker/spellcheck.cc b/chrome/renderer/spellchecker/spellcheck.cc
index ac35844..d16ac0c 100644
--- a/chrome/renderer/spellchecker/spellcheck.cc
+++ b/chrome/renderer/spellchecker/spellcheck.cc
@@ -11,6 +11,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/spellcheck_common.h"
 #include "chrome/common/spellcheck_messages.h"
+#include "content/renderer/render_thread.h"
 #include "third_party/hunspell/src/hunspell/hunspell.hxx"
 
 using base::TimeTicks;
@@ -221,7 +222,7 @@ bool SpellCheck::InitializeIfNeeded() {
     return false;
 
   if (!initialized_) {
-    Send(new SpellCheckHostMsg_RequestDictionary);
+    RenderThread::current()->Send(new SpellCheckHostMsg_RequestDictionary);
     initialized_ = true;
     return true;
   }
@@ -239,8 +240,8 @@ bool SpellCheck::CheckSpelling(const string16& word_to_check, int tag) {
   bool word_correct = false;
 
   if (is_using_platform_spelling_engine_) {
-    Send(new SpellCheckHostMsg_PlatformCheckSpelling(word_to_check, tag,
-                                                    &word_correct));
+    RenderThread::current()->Send(new SpellCheckHostMsg_PlatformCheckSpelling(
+        word_to_check, tag, &word_correct));
   } else {
     std::string word_to_check_utf8(UTF16ToUTF8(word_to_check));
     // Hunspell shouldn't let us exceed its max, but check just in case
@@ -264,8 +265,9 @@ void SpellCheck::FillSuggestionList(
     const string16& wrong_word,
     std::vector<string16>* optional_suggestions) {
   if (is_using_platform_spelling_engine_) {
-    Send(new SpellCheckHostMsg_PlatformFillSuggestionList(
-        wrong_word, optional_suggestions));
+    RenderThread::current()->Send(
+        new SpellCheckHostMsg_PlatformFillSuggestionList(
+            wrong_word, optional_suggestions));
     return;
   }
 
diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h
index c2a4086..6e28fbd 100644
--- a/chrome/renderer/spellchecker/spellcheck.h
+++ b/chrome/renderer/spellchecker/spellcheck.h
@@ -15,7 +15,7 @@
 #include "base/string16.h"
 #include "base/time.h"
 #include "chrome/renderer/spellchecker/spellcheck_worditerator.h"
-#include "content/renderer/render_process_observer.h"
+#include "content/public/renderer/render_process_observer.h"
 #include "ipc/ipc_platform_file.h"
 #include "unicode/uscript.h"
 
@@ -27,7 +27,7 @@ class MemoryMappedFile;
 
 // TODO(morrita): Needs reorg with SpellCheckProvider.
 // See http://crbug.com/73699.
-class SpellCheck : public RenderProcessObserver {
+class SpellCheck : public content::RenderProcessObserver {
  public:
   SpellCheck();
   virtual ~SpellCheck();
diff --git a/chrome/renderer/visitedlink_slave.h b/chrome/renderer/visitedlink_slave.h
index d437126..52110a1 100644
--- a/chrome/renderer/visitedlink_slave.h
+++ b/chrome/renderer/visitedlink_slave.h
@@ -8,12 +8,12 @@
 
 #include "base/shared_memory.h"
 #include "chrome/common/visitedlink_common.h"
-#include "content/renderer/render_process_observer.h"
+#include "content/public/renderer/render_process_observer.h"
 
 // Reads the link coloring database provided by the master. There can be any
 // number of slaves reading the same database.
 class VisitedLinkSlave : public VisitedLinkCommon,
-                         public RenderProcessObserver {
+                         public content::RenderProcessObserver {
  public:
   VisitedLinkSlave();
   virtual ~VisitedLinkSlave();
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 7420d01..2f08493 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -24,9 +24,12 @@
   ],
   'sources': [
     'public/renderer/content_renderer_client.h',
+    'public/renderer/render_process_observer.cc',
+    'public/renderer/render_process_observer.h',
     'public/renderer/render_view_observer.cc',
     'public/renderer/render_view_observer.h',
     'public/renderer/render_view_observer_tracker.h',
+    'public/renderer/render_view_visitor.h',
     'renderer/active_notification_tracker.cc',
     'renderer/active_notification_tracker.h',
     'renderer/device_orientation_dispatcher.cc',
@@ -105,8 +108,6 @@
     'renderer/render_process.h',
     'renderer/render_process_impl.cc',
     'renderer/render_process_impl.h',
-    'renderer/render_process_observer.cc',
-    'renderer/render_process_observer.h',
     'renderer/render_thread.cc',
     'renderer/render_thread.h',
     'renderer/render_view.cc',
@@ -114,7 +115,6 @@
     'renderer/render_view_linux.cc',
     'renderer/render_view_selection.cc',
     'renderer/render_view_selection.h',
-    'renderer/render_view_visitor.h',
     'renderer/render_widget.cc',
     'renderer/render_widget.h',
     'renderer/render_widget_fullscreen.cc',
diff --git a/content/public/renderer/render_process_observer.cc b/content/public/renderer/render_process_observer.cc
new file mode 100644
index 0000000..8e97cb7
--- /dev/null
+++ b/content/public/renderer/render_process_observer.cc
@@ -0,0 +1,14 @@
+// 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/public/renderer/render_process_observer.h"
+
+namespace content {
+
+bool RenderProcessObserver::OnControlMessageReceived(
+    const IPC::Message& message) {
+  return false;
+}
+
+}  // namespace content
diff --git a/content/renderer/render_process_observer.h b/content/public/renderer/render_process_observer.h
index 2652017..74391fd 100644
--- a/content/renderer/render_process_observer.h
+++ b/content/public/renderer/render_process_observer.h
@@ -2,39 +2,41 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_RENDER_PROCESS_OBSERVER_H_
-#define CONTENT_RENDERER_RENDER_PROCESS_OBSERVER_H_
+#ifndef CONTENT_PUBLIC_RENDERER_RENDER_PROCESS_OBSERVER_H_
+#define CONTENT_PUBLIC_RENDERER_RENDER_PROCESS_OBSERVER_H_
 #pragma once
 
 #include "base/basictypes.h"
-#include "ipc/ipc_message.h"
 #include "content/common/content_export.h"
 
-class GURL;
+namespace IPC {
+class Message;
+}
+
+namespace content {
 
 // Base class for objects that want to filter control IPC messages and get
 // notified of events.
-class CONTENT_EXPORT RenderProcessObserver : public IPC::Message::Sender {
+class CONTENT_EXPORT RenderProcessObserver {
  public:
-  RenderProcessObserver();
-  virtual ~RenderProcessObserver();
-
-  // IPC::Message::Sender
-  virtual bool Send(IPC::Message* message);
+  RenderProcessObserver() {}
+  virtual ~RenderProcessObserver() {}
 
   // Allows filtering of control messages.
   virtual bool OnControlMessageReceived(const IPC::Message& message);
 
   // Notification that the render process is shutting down.
-  virtual void OnRenderProcessShutdown();
+  virtual void OnRenderProcessShutdown() {}
 
   // Called right after the WebKit API is initialized.
-  virtual void WebKitInitialized();
+  virtual void WebKitInitialized() {}
 
-  virtual void IdleNotification();
+  virtual void IdleNotification() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderProcessObserver);
 };
 
-#endif  // CONTENT_RENDERER_RENDER_PROCESS_OBSERVER_H_
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_RENDERER_RENDER_PROCESS_OBSERVER_H_
diff --git a/content/renderer/render_view_visitor.h b/content/public/renderer/render_view_visitor.h
index 4773ae1..d7933c6 100644
--- a/content/renderer/render_view_visitor.h
+++ b/content/public/renderer/render_view_visitor.h
@@ -2,12 +2,14 @@
 // 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_VISITOR_H_
-#define CONTENT_RENDERER_RENDER_VIEW_VISITOR_H_
+#ifndef CONTENT_PUBLIC_RENDERER_RENDER_VIEW_VISITOR_H_
+#define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_VISITOR_H_
 #pragma once
 
 class RenderView;
 
+namespace content {
+
 class RenderViewVisitor {
  public:
   // Return true to continue visiting RenderViews or false to stop.
@@ -17,4 +19,6 @@ class RenderViewVisitor {
   virtual ~RenderViewVisitor() {}
 };
 
-#endif  // CONTENT_RENDERER_RENDER_VIEW_VISITOR_H_
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_RENDERER_RENDER_VIEW_VISITOR_H_
diff --git a/content/renderer/render_process_observer.cc b/content/renderer/render_process_observer.cc
deleted file mode 100644
index ac28339..0000000
--- a/content/renderer/render_process_observer.cc
+++ /dev/null
@@ -1,31 +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_process_observer.h"
-
-#include "content/renderer/render_thread.h"
-
-RenderProcessObserver::RenderProcessObserver() {
-}
-
-RenderProcessObserver::~RenderProcessObserver() {
-}
-
-bool RenderProcessObserver::Send(IPC::Message* message) {
-  return RenderThread::current()->Send(message);
-}
-
-bool RenderProcessObserver::OnControlMessageReceived(
-    const IPC::Message& message) {
-  return false;
-}
-
-void RenderProcessObserver::OnRenderProcessShutdown() {
-}
-
-void RenderProcessObserver::WebKitInitialized() {
-}
-
-void RenderProcessObserver::IdleNotification() {
-}
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 77cae07..cc39b76 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -34,6 +34,8 @@
 #include "content/common/view_messages.h"
 #include "content/common/web_database_observer_impl.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"
 #include "content/renderer/devtools_agent_filter.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/indexed_db_dispatcher.h"
@@ -43,9 +45,7 @@
 #include "content/renderer/media/video_capture_message_filter.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process_impl.h"
-#include "content/renderer/render_process_observer.h"
 #include "content/renderer/render_view.h"
-#include "content/renderer/render_view_visitor.h"
 #include "content/renderer/renderer_webidbfactory_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "ipc/ipc_channel_handle.h"
@@ -95,6 +95,7 @@ using WebKit::WebScriptController;
 using WebKit::WebString;
 using WebKit::WebStorageEventDispatcher;
 using WebKit::WebView;
+using content::RenderProcessObserver;
 
 namespace {
 static const double kInitialIdleHandlerDelayS = 1.0 /* seconds */;
@@ -108,7 +109,7 @@ static const int kPopupListBoxMinimumRowHeight = 60;
 static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls(
     base::LINKER_INITIALIZED);
 
-class RenderViewZoomer : public RenderViewVisitor {
+class RenderViewZoomer : public content::RenderViewVisitor {
  public:
   RenderViewZoomer(const GURL& url, double zoom_level)
       : zoom_level_(zoom_level) {
diff --git a/content/renderer/render_thread.h b/content/renderer/render_thread.h
index 3aacab5..88bd1e8 100644
--- a/content/renderer/render_thread.h
+++ b/content/renderer/render_thread.h
@@ -32,7 +32,6 @@ class GpuChannelHost;
 class IndexedDBDispatcher;
 class RendererHistogram;
 class RendererHistogramSnapshots;
-class RenderProcessObserver;
 class RendererNetPredictor;
 class RendererWebKitPlatformSupportImpl;
 class SkBitmap;
@@ -45,11 +44,6 @@ struct GPUInfo;
 struct ViewMsg_New_Params;
 struct WebPreferences;
 
-namespace base {
-class MessageLoopProxy;
-class Thread;
-}
-
 namespace IPC {
 struct ChannelHandle;
 }
@@ -58,6 +52,15 @@ namespace WebKit {
 class WebStorageEventDispatcher;
 }
 
+namespace base {
+class MessageLoopProxy;
+class Thread;
+}
+
+namespace content {
+class RenderProcessObserver;
+}
+
 namespace v8 {
 class Extension;
 }
@@ -133,8 +136,8 @@ class CONTENT_EXPORT RenderThread : public RenderThreadBase,
   virtual void WidgetHidden();
   virtual void WidgetRestored();
 
-  void AddObserver(RenderProcessObserver* observer);
-  void RemoveObserver(RenderProcessObserver* observer);
+  void AddObserver(content::RenderProcessObserver* observer);
+  void RemoveObserver(content::RenderProcessObserver* observer);
 
   // These methods modify how the next message is sent.  Normally, when sending
   // a synchronous message that runs a nested message loop, we need to suspend
@@ -276,7 +279,7 @@ class CONTENT_EXPORT RenderThread : public RenderThreadBase,
   // Map of registered v8 extensions. The key is the extension name.
   std::set<std::string> v8_extensions_;
 
-  ObserverList<RenderProcessObserver> observers_;
+  ObserverList<content::RenderProcessObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThread);
 };
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 52c6ca4..a8703e9 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -43,6 +43,7 @@
 #include "content/common/view_messages.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_view_observer.h"
+#include "content/public/renderer/render_view_visitor.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/devtools_agent.h"
 #include "content/renderer/external_popup_menu.h"
@@ -61,7 +62,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_visitor.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/renderer_accessibility.h"
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
@@ -238,6 +238,7 @@ using appcache::WebApplicationCacheHostImpl;
 using base::Time;
 using base::TimeDelta;
 using content::RenderViewObserver;
+using content::RenderViewVisitor;
 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 81b21e4..dd115fb 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 RenderViewVisitor;
 class RenderWidgetFullscreenPepper;
 class RendererAccessibility;
 class SkBitmap;
@@ -89,6 +88,7 @@ class WaitableEvent;
 namespace content {
 class P2PSocketDispatcher;
 class RenderViewObserver;
+class RenderViewVisitor;
 }  // namespace content
 
 namespace gfx {
@@ -191,7 +191,7 @@ class RenderView : public RenderWidget,
 
   // Visit all RenderViews with a live WebView (i.e., RenderViews that have
   // been closed but not yet destroyed are excluded).
-  CONTENT_EXPORT static void ForEach(RenderViewVisitor* visitor);
+  CONTENT_EXPORT static void ForEach(content::RenderViewVisitor* visitor);
 
   // Returns the RenderView containing the given WebView.
   CONTENT_EXPORT static RenderView* FromWebView(WebKit::WebView* webview);