Add separate ContentClient interfaces for gpu/plugin/renderer processes. Since we don't have a need for a chrome/gpu or chrome/plugin directory, their chrome implementations are in chrome/common. Use the renderer one for getting the sad plugin image.

Review URL: http://codereview.chromium.org/6708013

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

3 files changed, 7 insertions, 6 deletions

diff --git a/content/browser/content_browser_client.h b/content/browser/content_browser_client.h
index 7d5e916..b916263 100644
--- a/content/browser/content_browser_client.h
+++ b/content/browser/content_browser_client.h
@@ -6,6 +6,8 @@
 #define CONTENT_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #pragma once
 
+#include "content/common/content_client.h"
+
 class GURL;
 class Profile;
 class RenderViewHost;
@@ -16,9 +18,9 @@ namespace content {
 class ContentBrowserClient {
  public:
   // Initialize a RenderViewHost before its CreateRenderView method is called.
-  virtual void OnRenderViewCreation(RenderViewHost* render_view_host,
-                                    Profile* profile,
-                                    const GURL& url) {}
+  virtual void PreCreateRenderView(RenderViewHost* render_view_host,
+                                   Profile* profile,
+                                   const GURL& url) {}
 };
 
 }  // namespace content
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index 5707937..d9e43f7 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -341,7 +341,7 @@ void RenderViewHostTestHarness::Reload() {
 void RenderViewHostTestHarness::SetUp() {
   // Initialize Chrome's ContentBrowserClient here, since we won't go through
   // BrowserMain.
-  content::GetContentClient()->set_browser_client(&browser_client_);
+  content::GetContentClient()->set_browser(&browser_client_);
   contents_.reset(CreateTestTabContents());
 }
 
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index 51f5894..501a119 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -22,7 +22,6 @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/browser/webui/web_ui_factory.h"
-#include "content/common/content_client.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
 
@@ -488,7 +487,7 @@ bool RenderViewHostManager::InitRenderView(RenderViewHost* render_view_host,
 
   // Give the embedder a chance to initialize the render view.
   Profile* profile = delegate_->GetControllerForRenderManager().profile();
-  content::GetContentClient()->browser_client()->OnRenderViewCreation(
+  content::GetContentClient()->browser()->PreCreateRenderView(
       render_view_host, profile, entry.url());
 
   return delegate_->CreateRenderViewForRenderManager(render_view_host);