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

content/shell/shell_content_browser_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_browser_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 19 matching lines @@
 #include "base/android/path_utils.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
 #include "content/shell/android/shell_descriptors.h"
 #endif
 
 namespace content {
 
 namespace {
 
+ShellContentBrowserClient* g_browser_client;
+
 base::FilePath GetWebKitRootDirFilePath() {
   base::FilePath base_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
   if (file_util::PathExists(
           base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")))) {
     // We're in a WebKit-in-chrome checkout.
     return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
   } else if (file_util::PathExists(
           base_path.Append(FILE_PATH_LITERAL("chromium")))) {
     // We're in a WebKit-only checkout on Windows.
@@ skipping 15 matching lines @@
     // We're in a WebKit-only checkout.
     return webkit_path.Append(FILE_PATH_LITERAL("Source/WebKit/chromium"));
   } else {
     // We're in a Chromium checkout, and WebKit is in third_party/WebKit.
     return webkit_path.Append(FILE_PATH_LITERAL("../.."));
   }
 }
 
 }  // 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();
   base::FilePath dictionary_file_path = GetChromiumRootDirFilePath().Append(
       FILE_PATH_LITERAL("third_party/hyphen/hyph_en_US.dic"));
   file_util::AbsolutePath(&dictionary_file_path);
   hyphen_dictionary_file_ = base::CreatePlatformFile(dictionary_file_path,
                                                      base::PLATFORM_FILE_READ |
                                                      base::PLATFORM_FILE_OPEN,
                                                      NULL,
                                                      NULL);
 }
 
 ShellContentBrowserClient::~ShellContentBrowserClient() {
+  g_browser_client = NULL;
 }
 
 BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   shell_browser_main_parts_ = new ShellBrowserMainParts(parameters);
   return shell_browser_main_parts_;
 }
 
 void ShellContentBrowserClient::RenderProcessHostCreated(
     RenderProcessHost* host) {
@@ skipping 120 matching lines @@
 ShellBrowserContext*
 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
     BrowserContext* content_browser_context) {
   if (content_browser_context == browser_context())
     return browser_context();
   DCHECK_EQ(content_browser_context, off_the_record_browser_context());
   return off_the_record_browser_context();
 }
 
 }  // namespace content