diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 18:44:52 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 18:44:52 +0000 |
| commit | 7a91c555f3e057f8be9010a4e5385678ce822c28 (patch) | |
| tree | edb8a4384b09b3ce70b6b58a17afe5470eb5e039 /content/browser/child_process_security_policy_unittest.cc | |
| parent | e2e22a7ab44c2f49d856a9f840893c5462f52679 (diff) | |
| download | chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.zip chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.tar.gz chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.tar.bz2 | |
content/browser: Move more files into the content namespace.
Fixed most of the files found with the following command line:
$ git grep --files-without-match --name-only "namespace content {" -- content/browser/{*.cc,*.h.*.mm}
R=jam@chromium.org
Review URL: https://codereview.chromium.org/11274038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/child_process_security_policy_unittest.cc')
| -rw-r--r-- | content/browser/child_process_security_policy_unittest.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index 1be5a0b..bcd2c99 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 |