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

content/browser/loader/resource_loader_unittest.cc

 // Copyright (c) 2013 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/browser/loader/resource_loader.h"
 
 #include "base/message_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/loader/resource_loader_delegate.h"
 #include "content/public/browser/resource_request_info.h"
@@ skipping 212 matching lines @@
   ResourceLoader loader(request.Pass(), resource_handler.Pass(), this,
                         test_store.PassAs<net::ClientCertStore>());
 
   // Prepare a dummy certificate request.
   scoped_refptr<net::SSLCertRequestInfo> cert_request_info(
       new net::SSLCertRequestInfo());
   std::vector<std::string> dummy_authority(1, "dummy");
   cert_request_info->cert_authorities = dummy_authority;
 
   // Plug in test content browser client.
-  ContentBrowserClient* old_client = GetContentClient()->browser();
   SelectCertificateBrowserClient test_client;
-  GetContentClient()->set_browser_for_testing(&test_client);
+  ContentBrowserClient* old_client = SetBrowserClientForTesting(&test_client);
 
   // Everything is set up. Trigger the resource loader certificate request event
   // and run the message loop.
   loader.OnCertificateRequested(raw_ptr_to_request, cert_request_info.get());
   message_loop_->RunUntilIdle();
 
   // Restore the original content browser client.
-  GetContentClient()->set_browser_for_testing(old_client);
+  SetBrowserClientForTesting(old_client);
 
   // Check if the test store was queried against correct |cert_authorities|.
   EXPECT_EQ(1, raw_ptr_to_store->request_count());
   EXPECT_EQ(dummy_authority, raw_ptr_to_store->requested_authorities());
 
   // Check if the retrieved certificates were passed to the content browser
   // client.
   EXPECT_EQ(1, test_client.call_count());
   EXPECT_EQ(dummy_certs, test_client.passed_certs());
 }
 #endif  // !defined(OPENSSL)
 
 }  // namespace content