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

content/shell/shell_content_browser_client.cc

Index: content/shell/shell_content_browser_client.cc
===================================================================
--- content/shell/shell_content_browser_client.cc	(revision 192622)
+++ content/shell/shell_content_browser_client.cc	(working copy)
@@ -37,6 +37,8 @@
 
 namespace {
 
+ShellContentBrowserClient* g_browser_client;
+
 base::FilePath GetWebKitRootDirFilePath() {
   base::FilePath base_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
@@ -72,9 +74,15 @@
 
 }  // namespace
 
+ShellContentBrowserClient* ShellContentBrowserClient::Get() {
+  return g_browser_client;
+}
+
 ShellContentBrowserClient::ShellContentBrowserClient()
     : hyphen_dictionary_file_(base::kInvalidPlatformFileValue),
       shell_browser_main_parts_(NULL) {
+  DCHECK(!g_browser_client);
+  g_browser_client = this;
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     return;
   webkit_source_dir_ = GetWebKitRootDirFilePath();
@@ -89,6 +97,7 @@
 }
 
 ShellContentBrowserClient::~ShellContentBrowserClient() {
+  g_browser_client = NULL;
 }
 
 BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(