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

content/browser/site_instance_impl_unittest.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 "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/browsing_instance.h"
@@ skipping 74 matching lines @@
  public:
   SiteInstanceTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_user_blocking_thread_(BrowserThread::FILE_USER_BLOCKING,
                                    &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_),
         old_browser_client_(NULL) {
   }
 
   virtual void SetUp() {
-    old_browser_client_ = GetContentClient()->browser();
-    GetContentClient()->set_browser_for_testing(&browser_client_);
+    old_browser_client_ = SetBrowserClientForTesting(&browser_client_);
     url_util::AddStandardScheme(kPrivilegedScheme);
     url_util::AddStandardScheme(chrome::kChromeUIScheme);
   }
 
   virtual void TearDown() {
     // Ensure that no RenderProcessHosts are left over after the tests.
     EXPECT_TRUE(RenderProcessHost::AllHostsIterator().IsAtEnd());
 
-    GetContentClient()->set_browser_for_testing(old_browser_client_);
+    SetBrowserClientForTesting(old_browser_client_);
 
     // http://crbug.com/143565 found SiteInstanceTest leaking an
     // AppCacheDatabase. This happens because some part of the test indirectly
     // calls StoragePartitionImplMap::PostCreateInitialization(), which posts
     // a task to the IO thread to create the AppCacheDatabase. Since the
     // message loop is not running, the AppCacheDatabase ends up getting
     // created when DrainMessageLoops() gets called at the end of a test case.
     // Immediately after, the test case ends and the AppCacheDatabase gets
     // scheduled for deletion. Here, call DrainMessageLoops() again so the
     // AppCacheDatabase actually gets deleted.
@@ skipping 639 matching lines @@
   EXPECT_TRUE(instance->GetSiteURL().is_empty());
   host.reset(instance->GetProcess());
 
   EXPECT_FALSE(RenderProcessHostImpl::GetProcessHostForSite(
       browser_context.get(), GURL()));
 
   DrainMessageLoops();
 }
 
 }  // namespace content