Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

content/shell/shell_content_renderer_client.cc

 // Copyright (c) 2012 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/shell/shell_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "content/public/common/content_constants.h"
@@ skipping 24 matching lines @@
 using WebKit::WebPluginParams;
 using WebKit::WebRTCPeerConnectionHandler;
 using WebKit::WebRTCPeerConnectionHandlerClient;
 using WebKit::WebThemeEngine;
 using WebTestRunner::WebTestDelegate;
 using WebTestRunner::WebTestInterfaces;
 using WebTestRunner::WebTestProxyBase;
 
 namespace content {
 
+namespace {

[brettw, 2013/04/03 23:40:26]

Nit: blank line after this.

+ShellContentRendererClient* g_renderer_client;
+}
+
+ShellContentRendererClient* ShellContentRendererClient::Get() {
+  return g_renderer_client;
+}
+
 ShellContentRendererClient::ShellContentRendererClient() {
+  DCHECK(!g_renderer_client);
+  g_renderer_client = this;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
     EnableWebTestProxyCreation(
         base::Bind(&ShellContentRendererClient::WebTestProxyCreated,
                    base::Unretained(this)));
   }
 }
 
 ShellContentRendererClient::~ShellContentRendererClient() {
+  g_renderer_client = NULL;
 }
 
 void ShellContentRendererClient::LoadHyphenDictionary(
     base::PlatformFile dict_file) {
   if (!hyphenator_)
     hyphenator_.reset(new webkit_glue::MockWebHyphenator);
   base::SeekPlatformFile(dict_file, base::PLATFORM_FILE_FROM_BEGIN, 0);
   hyphenator_->LoadDictionary(dict_file);
 }
 
@@ skipping 114 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserPluginForAllViewTypes)) {
     // Allow BrowserPlugin if forced by command line flag. This is generally
     // true for tests.
     return true;
   }
   return ContentRendererClient::AllowBrowserPlugin(container);
 }
 
 }  // namespace content