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

content/test/content_browser_test.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 "content/test/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 42 matching lines @@
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(switches::kContentBrowserTest);
 
   SetUpCommandLine(command_line);
 
   // Single-process mode is not set in BrowserMain, so process it explicitly,
   // and set up renderer.
   if (command_line->HasSwitch(switches::kSingleProcess)) {
     single_process_renderer_client_.reset(new ShellContentRendererClient);
-    GetContentClient()->set_renderer_for_testing(
-        single_process_renderer_client_.get());
+    SetRendererClientForTesting(single_process_renderer_client_.get());
   }
 
 #if defined(OS_MACOSX)
   // See InProcessBrowserTest::PrepareTestCommandLine().
   base::FilePath subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
   subprocess_path = subprocess_path.DirName().DirName();
   DCHECK_EQ(subprocess_path.BaseName().value(), "Contents");
   subprocess_path = subprocess_path.Append(
       "Frameworks/Content Shell Helper.app/Contents/MacOS/Content Shell Helper");
@@ skipping 49 matching lines @@
 
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     i.GetCurrentValue()->FastShutdownIfPossible();
   }
 
   Shell::CloseAllWindows();
 }
 
 Shell* ContentBrowserTest::CreateBrowser() {
-  ShellContentBrowserClient* browser_client =
-      static_cast<ShellContentBrowserClient*>(GetContentClient()->browser());
   return Shell::CreateNewWindow(
-      browser_client->browser_context(),
+      ShellContentBrowserClient::Get()->browser_context(),
       GURL(chrome::kAboutBlankURL),
       NULL,
       MSG_ROUTING_NONE,
       gfx::Size());
 }
 
 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
-  ShellContentBrowserClient* browser_client =
-      static_cast<ShellContentBrowserClient*>(GetContentClient()->browser());
   return Shell::CreateNewWindow(
-      browser_client->off_the_record_browser_context(),
+      ShellContentBrowserClient::Get()->off_the_record_browser_context(),
       GURL(chrome::kAboutBlankURL),
       NULL,
       MSG_ROUTING_NONE,
       gfx::Size());
 }
 
 }  // namespace content