Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh…

content/browser/child_process_security_policy_unittest.cc

Index: content/browser/child_process_security_policy_unittest.cc
===================================================================
--- content/browser/child_process_security_policy_unittest.cc	(revision 140381)
+++ content/browser/child_process_security_policy_unittest.cc	(working copy)
@@ -9,9 +9,9 @@
 #include "base/file_path.h"
 #include "base/platform_file.h"
 #include "content/browser/child_process_security_policy_impl.h"
-#include "content/browser/mock_content_browser_client.h"
 #include "content/common/test_url_constants.h"
 #include "content/public/common/url_constants.h"
+#include "content/test/test_content_browser_client.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -21,7 +21,7 @@
 const int kWorkerRendererID = kRendererID + 1;
 
 class ChildProcessSecurityPolicyTestBrowserClient
-    : public content::MockContentBrowserClient {
+    : public content::TestContentBrowserClient {
  public:
   ChildProcessSecurityPolicyTestBrowserClient() {}
 
@@ -50,7 +50,7 @@
 
   virtual void SetUp() {
     old_browser_client_ = content::GetContentClient()->browser();
-    content::GetContentClient()->set_browser(&test_browser_client_);
+    content::GetContentClient()->set_browser_for_testing(&test_browser_client_);
 
     // Claim to always handle chrome:// URLs because the CPSP's notion of
     // allowing WebUI bindings is hard-wired to this particular scheme.
@@ -59,7 +59,7 @@
 
   virtual void TearDown() {
     test_browser_client_.ClearSchemes();
-    content::GetContentClient()->set_browser(old_browser_client_);
+    content::GetContentClient()->set_browser_for_testing(old_browser_client_);
   }
 
  protected: