| Index: content/browser/child_process_security_policy_unittest.cc
|
| ===================================================================
|
| --- content/browser/child_process_security_policy_unittest.cc (revision 164121)
|
| +++ content/browser/child_process_security_policy_unittest.cc (working copy)
|
| @@ -14,15 +14,13 @@
|
| #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 TestContentBrowserClient {
|
| + : public content::TestContentBrowserClient {
|
| public:
|
| ChildProcessSecurityPolicyTestBrowserClient() {}
|
|
|
| @@ -50,8 +48,8 @@
|
| }
|
|
|
| virtual void SetUp() {
|
| - old_browser_client_ = GetContentClient()->browser();
|
| - GetContentClient()->set_browser_for_testing(&test_browser_client_);
|
| + old_browser_client_ = content::GetContentClient()->browser();
|
| + 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.
|
| @@ -60,7 +58,7 @@
|
|
|
| virtual void TearDown() {
|
| test_browser_client_.ClearSchemes();
|
| - GetContentClient()->set_browser_for_testing(old_browser_client_);
|
| + content::GetContentClient()->set_browser_for_testing(old_browser_client_);
|
| }
|
|
|
| protected:
|
| @@ -70,7 +68,7 @@
|
|
|
| private:
|
| ChildProcessSecurityPolicyTestBrowserClient test_browser_client_;
|
| - ContentBrowserClient* old_browser_client_;
|
| + content::ContentBrowserClient* old_browser_client_;
|
| };
|
|
|
| TEST_F(ChildProcessSecurityPolicyTest, IsWebSafeSchemeTest) {
|
| @@ -492,5 +490,3 @@
|
| EXPECT_FALSE(p->CanReadFile(kRendererID, file));
|
| EXPECT_FALSE(p->HasWebUIBindings(kRendererID));
|
| }
|
| -
|
| -} // namespace content
|
|
|