Revert 164120 - content/browser: Move more files into the content namespace.

content/browser/child_process_security_policy_browsertest.cc

Index: content/browser/child_process_security_policy_browsertest.cc
===================================================================
--- content/browser/child_process_security_policy_browsertest.cc	(revision 164121)
+++ content/browser/child_process_security_policy_browsertest.cc	(working copy)
@@ -16,19 +16,17 @@
 #include "content/test/content_browser_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace content {
-
 class ChildProcessSecurityPolicyInProcessBrowserTest
-    : public ContentBrowserTest {
+    : public content::ContentBrowserTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() {
     EXPECT_EQ(
       ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
           0U);
     ContentBrowserTest::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() {
     EXPECT_EQ(
       ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
           0U);
@@ -41,21 +39,19 @@
 #else
 IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) {
 #endif
-  GURL url = GetTestUrl("", "simple_page.html");
+  GURL url = content::GetTestUrl("", "simple_page.html");
 
-  NavigateToURL(shell(), url);
+  content::NavigateToURL(shell(), url);
   EXPECT_EQ(
       ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(),
           1U);
 
-  WebContents* web_contents = shell()->web_contents();
+  content::WebContents* web_contents = shell()->web_contents();
   base::KillProcess(web_contents->GetRenderProcessHost()->GetHandle(),
-                    RESULT_CODE_KILLED, true);
+                    content::RESULT_CODE_KILLED, true);
 
   web_contents->GetController().Reload(true);
   EXPECT_EQ(
       1U,
       ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size());
 }
-
-}  // namespace content
Property changes on: content/browser/child_process_security_policy_browsertest.cc
___________________________________________________________________
Deleted: svn:mergeinfo