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

chrome/renderer/chrome_render_process_observer.cc

 // 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 "chrome/renderer/chrome_render_process_observer.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_localization_peer.h"
 #include "chrome/common/net/net_resource_provider.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/renderer/security_filter_peer.h"
 #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"
 #include "net/base/net_errors.h"
 #include "net/base/net_module.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h"
 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h"
@@ skipping 66 matching lines @@
     WebCache::getUsageStats(&stats);
     RenderThread::current()->Send(new ChromeViewHostMsg_UpdatedCacheStats(
         stats));
   }
 
   ScopedRunnableMethodFactory<RendererResourceDelegate> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererResourceDelegate);
 };
 
-class RenderViewContentSettingsSetter : public RenderViewVisitor {
+class RenderViewContentSettingsSetter : public content::RenderViewVisitor {
  public:
   RenderViewContentSettingsSetter(const GURL& url,
                                   const ContentSettings& content_settings)
       : url_(url),
         content_settings_(content_settings) {
   }
 
   virtual bool Visit(RenderView* render_view) {
     if (GURL(render_view->webview()->mainFrame()->document().url()) == url_) {
       ContentSettingsObserver::Get(render_view)->SetContentSettings(
@@ skipping 333 matching lines @@
   if (on_navigation) {
     clear_cache_pending_ = true;
   } else {
     WebCache::clear();
   }
 }
 
 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)
 void ChromeRenderProcessObserver::OnGetRendererTcmalloc() {
   std::string result;
   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(
     bool profiling, const std::string& filename_prefix) {
 #if !defined(OS_WIN)
   // TODO(stevenjb): Create MallocExtension wrappers for HeapProfile functions.
   if (profiling)
     HeapProfilerStart(filename_prefix.c_str());
   else
     HeapProfilerStop();
 #endif
 }
 
 void ChromeRenderProcessObserver::OnWriteTcmallocHeapProfile(
     const FilePath::StringType& filename) {
 #if !defined(OS_WIN)
   // TODO(stevenjb): Create MallocExtension wrappers for HeapProfile functions.
   if (!IsHeapProfilerRunning())
     return;
   char* profile = GetHeapProfile();
   if (!profile) {
     LOG(WARNING) << "Unable to get heap profile.";
     return;
   }
   // The render process can not write to a file, so copy the result into
   // 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
 }
 
 #endif
 
 void ChromeRenderProcessObserver::OnSetFieldTrialGroup(
     const std::string& field_trial_name,
     const std::string& group_name) {
   base::FieldTrialList::CreateFieldTrial(field_trial_name, group_name);
 }
 
 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() {
   // Clear the object cache (as much as possible; some live objects cannot be
   // freed).
   WebCache::clear();
 
   // Clear the font/glyph cache.
   WebFontCache::clear();
 
@@ skipping 20 matching lines @@
   if (client_)
     client_->OnPurgeMemory();
 }
 
 void ChromeRenderProcessObserver::ExecutePendingClearCache() {
   if (clear_cache_pending_) {
     clear_cache_pending_ = false;
     WebCache::clear();
   }
 }