| Index: content/browser/child_process_security_policy_unittest.cc
|
| diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc
|
| index 1be5a0bdd5334c593c851904450e92388829a129..bcd2c996613346a0748e5d74096bff68d44752a1 100644
|
| --- a/content/browser/child_process_security_policy_unittest.cc
|
| +++ b/content/browser/child_process_security_policy_unittest.cc
|
| @@ -14,13 +14,15 @@
|
| #include "googleurl/src/gurl.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +namespace content {
|
| +
|
| namespace {
|
|
|
| const int kRendererID = 42;
|
| const int kWorkerRendererID = kRendererID + 1;
|
|
|
| class ChildProcessSecurityPolicyTestBrowserClient
|
| - : public content::TestContentBrowserClient {
|
| + : public TestContentBrowserClient {
|
| public:
|
| ChildProcessSecurityPolicyTestBrowserClient() {}
|
|
|
| @@ -48,8 +50,8 @@ class ChildProcessSecurityPolicyTest : public testing::Test {
|
| }
|
|
|
| virtual void SetUp() {
|
| - old_browser_client_ = content::GetContentClient()->browser();
|
| - content::GetContentClient()->set_browser_for_testing(&test_browser_client_);
|
| + old_browser_client_ = GetContentClient()->browser();
|
| + 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.
|
| @@ -58,7 +60,7 @@ class ChildProcessSecurityPolicyTest : public testing::Test {
|
|
|
| virtual void TearDown() {
|
| test_browser_client_.ClearSchemes();
|
| - content::GetContentClient()->set_browser_for_testing(old_browser_client_);
|
| + GetContentClient()->set_browser_for_testing(old_browser_client_);
|
| }
|
|
|
| protected:
|
| @@ -68,7 +70,7 @@ class ChildProcessSecurityPolicyTest : public testing::Test {
|
|
|
| private:
|
| ChildProcessSecurityPolicyTestBrowserClient test_browser_client_;
|
| - content::ContentBrowserClient* old_browser_client_;
|
| + ContentBrowserClient* old_browser_client_;
|
| };
|
|
|
| TEST_F(ChildProcessSecurityPolicyTest, IsWebSafeSchemeTest) {
|
| @@ -490,3 +492,5 @@ TEST_F(ChildProcessSecurityPolicyTest, RemoveRace) {
|
| EXPECT_FALSE(p->CanReadFile(kRendererID, file));
|
| EXPECT_FALSE(p->HasWebUIBindings(kRendererID));
|
| }
|
| +
|
| +} // namespace content
|
|
|