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

content/browser/child_process_security_policy_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 <set>
 #include <string>
 
 #include "base/basictypes.h"
 #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"
 
 namespace {
 
 const int kRendererID = 42;
 const int kWorkerRendererID = kRendererID + 1;
 
 class ChildProcessSecurityPolicyTestBrowserClient
-    : public content::MockContentBrowserClient {
+    : public content::TestContentBrowserClient {
  public:
   ChildProcessSecurityPolicyTestBrowserClient() {}
 
   virtual bool IsHandledURL(const GURL& url) {
     return schemes_.find(url.scheme()) != schemes_.end();
   }
 
   void ClearSchemes() {
     schemes_.clear();
   }
 
   void AddScheme(const std::string& scheme) {
     schemes_.insert(scheme);
   }
 
  private:
   std::set<std::string> schemes_;
 };
 
 }  // namespace
 
 class ChildProcessSecurityPolicyTest : public testing::Test {
  public:
   ChildProcessSecurityPolicyTest() : old_browser_client_(NULL) {
   }
 
   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.
     test_browser_client_.AddScheme("chrome");
   }
 
   virtual void TearDown() {
     test_browser_client_.ClearSchemes();
-    content::GetContentClient()->set_browser(old_browser_client_);
+    content::GetContentClient()->set_browser_for_testing(old_browser_client_);
   }
 
  protected:
   void RegisterTestScheme(const std::string& scheme) {
     test_browser_client_.AddScheme(scheme);
   }
 
  private:
   ChildProcessSecurityPolicyTestBrowserClient test_browser_client_;
   content::ContentBrowserClient* old_browser_client_;
@@ skipping 394 matching lines @@
 
   // Renderers are added and removed on the UI thread, but the policy can be
   // queried on the IO thread.  The ChildProcessSecurityPolicy needs to be
   // prepared to answer policy questions about renderers who no longer exist.
 
   // In this case, we default to secure behavior.
   EXPECT_FALSE(p->CanRequestURL(kRendererID, url));
   EXPECT_FALSE(p->CanReadFile(kRendererID, file));
   EXPECT_FALSE(p->HasWebUIBindings(kRendererID));
 }