Move remaining content test code into the content namespace.

Review URL: https://codereview.chromium.org/11346016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164789 0039d316-1c4b-4281-b951-d872f2087c98

60 files changed, 233 insertions, 162 deletions

diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc
index f9c9ae6..1649b2d 100644
--- a/chrome/browser/accessibility/accessibility_win_browsertest.cc
+++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc
@@ -350,8 +350,10 @@ void AccessibleChecker::CheckIA2Role(IAccessible* accessible) {
   ASSERT_EQ(S_OK, hr);
   EXPECT_EQ(ia2_role_, ia2_role);
   if (ia2_role_ != ia2_role) {
-    LOG(ERROR) << "Expected ia2 role: " << IAccessible2RoleToString(ia2_role_);
-    LOG(ERROR) << "Got ia2 role: " << IAccessible2RoleToString(ia2_role);
+    LOG(ERROR) << "Expected ia2 role: " <<
+        content::IAccessible2RoleToString(ia2_role_);
+    LOG(ERROR) << "Got ia2 role: " <<
+        content::IAccessible2RoleToString(ia2_role);
   }
 }
 
@@ -377,8 +379,10 @@ void AccessibleChecker::CheckAccessibleState(IAccessible* accessible) {
   ASSERT_EQ(VT_I4, V_VT(&var_state));
   EXPECT_EQ(state_, V_I4(&var_state));
   if (state_ != V_I4(&var_state)) {
-    LOG(ERROR) << "Expected state: " << IAccessibleStateToString(state_);
-    LOG(ERROR) << "Got state: " << IAccessibleStateToString(V_I4(&var_state));
+    LOG(ERROR) << "Expected state: " <<
+        content::IAccessibleStateToString(state_);
+    LOG(ERROR) << "Got state: " <<
+        content::IAccessibleStateToString(V_I4(&var_state));
   }
 }
 
@@ -408,7 +412,7 @@ void AccessibleChecker::CheckAccessibleChildren(IAccessible* parent) {
 
 string16 AccessibleChecker::RoleVariantToString(VARIANT* role_variant) {
   if (V_VT(role_variant) == VT_I4)
-    return IAccessibleRoleToString(V_I4(role_variant));
+    return content::IAccessibleRoleToString(V_I4(role_variant));
   else if (V_VT(role_variant) == VT_BSTR)
     return string16(V_BSTR(role_variant), SysStringLen(V_BSTR(role_variant)));
   return string16();
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc
index 941d667..e0bf0bf 100644
--- a/chrome/browser/browser_encoding_browsertest.cc
+++ b/chrome/browser/browser_encoding_browsertest.cc
@@ -123,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, SLOW_TestEncodingAliasMapping) {
     test_file_path = test_file_path.AppendASCII(
         kEncodingTestDatas[i].file_name);
 
-    GURL url = URLRequestMockHTTPJob::GetMockUrl(test_file_path);
+    GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path);
 
     // When looping through all the above files in one WebContents, there's a
     // race condition on Windows trybots that causes the previous encoding to be
@@ -147,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
 
   FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kOverrideTestDir);
   test_dir_path = test_dir_path.AppendASCII(kTestFileName);
-  GURL url = URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
+  GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
   EXPECT_EQ("ISO-8859-1", web_contents->GetEncoding());
@@ -261,7 +261,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) {
 
     FilePath test_file_path(test_dir_path);
     test_file_path = test_file_path.AppendASCII(kTestDatas[i].test_file_name);
-    GURL url = URLRequestMockHTTPJob::GetMockUrl(test_file_path);
+    GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path);
     ui_test_utils::NavigateToURL(browser(), url);
 
     // Get the encoding used for the page, it must be the default charset we
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
index 39b2a20..a34cfe7 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
@@ -28,7 +28,7 @@ using content::BrowserThread;
 
 namespace {
 void SetUrlRequestMock(const FilePath& path) {
-  URLRequestMockHTTPJob::AddUrlHandler(path);
+  content::URLRequestMockHTTPJob::AddUrlHandler(path);
 }
 }
 
@@ -97,7 +97,7 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Download) {
 
 // Verify can modify database after deleting it.
 IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Database) {
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(
+  GURL url(content::URLRequestMockHTTPJob::GetMockUrl(
       FilePath().AppendASCII("simple_database.html")));
   ui_test_utils::NavigateToURL(browser(), url);
 
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index f30b972..9b7f61f 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -55,6 +55,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
+using content::URLRequestFailedJob;
+using content::URLRequestMockHTTPJob;
 
 namespace captive_portal {
 
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index 30dce25..0c1c2b6 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -33,6 +33,7 @@
 #endif
 
 using content::BrowserThread;
+using content::URLRequestMockHTTPJob;
 
 class ContentSettingsTest : public InProcessBrowserTest {
  public:
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index a5d3abb..239cbc3 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -75,6 +75,8 @@ using content::DownloadItem;
 using content::DownloadManager;
 using content::DownloadPersistentStoreInfo;
 using content::DownloadUrlParameters;
+using content::URLRequestMockHTTPJob;
+using content::URLRequestSlowDownloadJob;
 using content::WebContents;
 using extensions::Extension;
 using extensions::FeatureSwitch;
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 39d9801..372db2f 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -51,6 +51,7 @@ using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::DownloadPersistentStoreInfo;
+using content::URLRequestMockHTTPJob;
 using content::WebContents;
 
 const FilePath::CharType kTestDir[] = FILE_PATH_LITERAL("save_page");
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc
index a3e96eb..c58eb84 100644
--- a/chrome/browser/errorpage_browsertest.cc
+++ b/chrome/browser/errorpage_browsertest.cc
@@ -20,6 +20,7 @@
 
 using content::BrowserThread;
 using content::NavigationController;
+using content::URLRequestFailedJob;
 
 class ErrorPageTest : public InProcessBrowserTest {
  public:
@@ -32,7 +33,7 @@ class ErrorPageTest : public InProcessBrowserTest {
   void NavigateToFileURL(const FilePath::StringType& file_path) {
     ui_test_utils::NavigateToURL(
         browser(),
-        URLRequestMockHTTPJob::GetMockUrl(FilePath(file_path)));
+        content::URLRequestMockHTTPJob::GetMockUrl(FilePath(file_path)));
   }
 
   // Navigates to the given URL and waits for |num_navigations| to occur, and
@@ -194,7 +195,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack2Forward2) {
 // Test that a DNS error occuring in an iframe.
 IN_PROC_BROWSER_TEST_F(ErrorPageTest, IFrameDNSError_Basic) {
   NavigateToURLAndWaitForTitle(
-      URLRequestMockHTTPJob::GetMockUrl(
+      content::URLRequestMockHTTPJob::GetMockUrl(
           FilePath(FILE_PATH_LITERAL("iframe_dns_error.html"))),
       "Blah",
       1);
@@ -232,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_IFrameDNSError_GoBackAndForward) {
 // Checks that the Link Doctor is not loaded when we receive an actual 404 page.
 IN_PROC_BROWSER_TEST_F(ErrorPageTest, Page404) {
   NavigateToURLAndWaitForTitle(
-      URLRequestMockHTTPJob::GetMockUrl(
+      content::URLRequestMockHTTPJob::GetMockUrl(
           FilePath(FILE_PATH_LITERAL("page404.html"))),
       "SUCCESS",
       1);
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
index ec166a6..702d89e 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -59,6 +59,7 @@ using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::DownloadPersistentStoreInfo;
+using content::URLRequestSlowDownloadJob;
 
 namespace events = extensions::event_names;
 
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.cc b/chrome/browser/net/url_request_mock_link_doctor_job.cc
index d68122b..28b793db 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.cc
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.cc
@@ -10,6 +10,8 @@
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_filter.h"
 
+using content::URLRequestMockHTTPJob;
+
 namespace {
 
 FilePath GetMockFilePath() {
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.h b/chrome/browser/net/url_request_mock_link_doctor_job.h
index c559d06..41ac881 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.h
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.h
@@ -9,7 +9,7 @@
 
 #include "content/test/net/url_request_mock_http_job.h"
 
-class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
+class URLRequestMockLinkDoctorJob : public content::URLRequestMockHTTPJob {
  public:
   URLRequestMockLinkDoctorJob(net::URLRequest* request,
                               net::NetworkDelegate* network_delegate);
diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc
index 98219ad..24de6d8 100644
--- a/chrome/browser/net/url_request_mock_util.cc
+++ b/chrome/browser/net/url_request_mock_util.cc
@@ -34,14 +34,14 @@ void SetUrlRequestMocksEnabled(bool enabled) {
 
     net::URLRequestFilter::GetInstance()->ClearHandlers();
 
-    URLRequestFailedJob::AddUrlHandler();
+    content::URLRequestFailedJob::AddUrlHandler();
     URLRequestMockLinkDoctorJob::AddUrlHandler();
-    URLRequestSlowDownloadJob::AddUrlHandler();
+    content::URLRequestSlowDownloadJob::AddUrlHandler();
 
     FilePath root_http;
     PathService::Get(chrome::DIR_TEST_DATA, &root_http);
-    URLRequestMockHTTPJob::AddUrlHandler(root_http);
-    URLRequestSlowHTTPJob::AddUrlHandler(root_http);
+    content::URLRequestMockHTTPJob::AddUrlHandler(root_http);
+    content::URLRequestSlowHTTPJob::AddUrlHandler(root_http);
   } else {
     // Revert to the default handlers.
     net::URLRequestFilter::GetInstance()->ClearHandlers();
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index c8b11df..ff79bcb 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -105,6 +105,7 @@
 #endif
 
 using content::BrowserThread;
+using content::URLRequestMockHTTPJob;
 using testing::Return;
 
 namespace policy {
diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc
index a56c4ac..4a393d3 100644
--- a/chrome/browser/ui/browser_close_browsertest.cc
+++ b/chrome/browser/ui/browser_close_browsertest.cc
@@ -33,6 +33,7 @@ using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
+using content::URLRequestSlowDownloadJob;
 
 class BrowserCloseTest : public InProcessBrowserTest {
  public:
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc
index 0b98a00..7ace964 100644
--- a/chrome/browser/unload_browsertest.cc
+++ b/chrome/browser/unload_browsertest.cc
@@ -141,7 +141,7 @@ class UnloadTest : public InProcessBrowserTest {
   }
 
   void NavigateToNolistenersFileTwice() {
-    GURL url(URLRequestMockHTTPJob::GetMockUrl(
+    GURL url(content::URLRequestMockHTTPJob::GetMockUrl(
         FilePath(FILE_PATH_LITERAL("title2.html"))));
     ui_test_utils::NavigateToURL(browser(), url);
     CheckTitle("Title Of Awesomeness");
@@ -153,7 +153,7 @@ class UnloadTest : public InProcessBrowserTest {
   // load is purposely async to test the case where the user loads another
   // page without waiting for the first load to complete.
   void NavigateToNolistenersFileTwiceAsync() {
-    GURL url(URLRequestMockHTTPJob::GetMockUrl(
+    GURL url(content::URLRequestMockHTTPJob::GetMockUrl(
         FilePath(FILE_PATH_LITERAL("title2.html"))));
     ui_test_utils::NavigateToURLWithDisposition(browser(), url, CURRENT_TAB, 0);
     ui_test_utils::NavigateToURL(browser(), url);
diff --git a/content/browser/audio_browsertest.cc b/content/browser/audio_browsertest.cc
index 4e14969..db0301c 100644
--- a/content/browser/audio_browsertest.cc
+++ b/content/browser/audio_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include "content/test/layout_browsertest.h"
 
+namespace content {
+
 class AudioLayoutTest : public InProcessBrowserLayoutTest {
  protected:
   AudioLayoutTest() : InProcessBrowserLayoutTest(
@@ -59,3 +61,5 @@ IN_PROC_BROWSER_TEST_F(AudioLayoutTest, MediaCanPlayWavAudio) {
 IN_PROC_BROWSER_TEST_F(AudioLayoutTest, MediaDocumentAudioSize) {
   RunLayoutTest("media-document-audio-size.html");
 }
+
+}  // namespace content
diff --git a/content/browser/fileapi/blob_layout_browsertest.cc b/content/browser/fileapi/blob_layout_browsertest.cc
index 3ccabdd..05478b4 100644
--- a/content/browser/fileapi/blob_layout_browsertest.cc
+++ b/content/browser/fileapi/blob_layout_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include "content/test/layout_browsertest.h"
 
+namespace content {
+
 class BlobLayoutTest : public InProcessBrowserLayoutTest {
  public:
   BlobLayoutTest() :
@@ -16,3 +18,5 @@ class BlobLayoutTest : public InProcessBrowserLayoutTest {
 IN_PROC_BROWSER_TEST_F(BlobLayoutTest, SliceTests) {
   RunLayoutTest("blob-slice-test.html");
 }
+
+}  // namespace content
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc
index 20c1a57..41f3ac3 100644
--- a/content/browser/media_browsertest.cc
+++ b/content/browser/media_browsertest.cc
@@ -15,13 +15,14 @@
 #include "content/test/content_browser_test_utils.h"
 #include "googleurl/src/gurl.h"
 
+namespace content {
+
 // Tests playback and seeking of an audio or video file over file or http based
 // on a test parameter.  Test starts with playback, then, after X seconds or the
 // ended event fires, seeks near end of file; see player.html for details.  The
 // test completes when either the last 'ended' or an 'error' event fires.
-class MediaTest
-    : public testing::WithParamInterface<bool>,
-      public content::ContentBrowserTest {
+class MediaTest : public testing::WithParamInterface<bool>,
+                  public ContentBrowserTest {
  public:
   // Play specified audio over http:// or file:// depending on |http| setting.
   void PlayAudio(const char* media_file, bool http) {
@@ -48,9 +49,9 @@ class MediaTest
           base::StringPrintf("files/media/player.html?%s=%s", tag, media_file));
     }
 
-    FilePath test_file_path = content::GetTestFilePath("media", "player.html");
+    FilePath test_file_path = GetTestFilePath("media", "player.html");
     std::string query = base::StringPrintf("%s=%s", tag, media_file);
-    return content::GetFileUrlWithQuery(test_file_path, query);
+    return GetFileUrlWithQuery(test_file_path, query);
   }
 
   void PlayMedia(const char* tag, const char* media_file, bool http) {
@@ -63,11 +64,11 @@ class MediaTest
     const string16 kEnded = ASCIIToUTF16("ENDED");
     const string16 kError = ASCIIToUTF16("ERROR");
     const string16 kFailed = ASCIIToUTF16("FAILED");
-    content::TitleWatcher title_watcher(shell()->web_contents(), kEnded);
+    TitleWatcher title_watcher(shell()->web_contents(), kEnded);
     title_watcher.AlsoWaitForTitle(kFailed);
     title_watcher.AlsoWaitForTitle(kError);
 
-    content::NavigateToURL(shell(), player_gurl);
+    NavigateToURL(shell(), player_gurl);
 
     string16 final_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(kEnded, final_title);
@@ -192,3 +193,5 @@ IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) {
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) {
   RunLayoutTest("video-no-autoplay.html");
 }
+
+}  // namespace content
diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc
index 71e3b8c..5a34856 100644
--- a/content/browser/plugin_browsertest.cc
+++ b/content/browser/plugin_browsertest.cc
@@ -21,6 +21,7 @@
 #include "base/win/registry.h"
 #endif
 
+namespace content {
 namespace {
 
 void SetUrlRequestMock(const FilePath& path) {
@@ -29,8 +30,6 @@ void SetUrlRequestMock(const FilePath& path) {
 
 }
 
-namespace content {
-
 class PluginTest : public ContentBrowserTest {
  protected:
   PluginTest() {}
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc
index 21e6914..027a670 100644
--- a/content/browser/site_instance_impl_unittest.cc
+++ b/content/browser/site_instance_impl_unittest.cc
@@ -28,26 +28,14 @@
 #include "googleurl/src/url_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::BrowserContext;
-using content::BrowserThread;
-using content::BrowserThreadImpl;
-using content::MockRenderProcessHost;
-using content::MockRenderProcessHostFactory;
-using content::NavigationEntry;
-using content::NavigationEntryImpl;
-using content::SiteInstance;
-using content::WebContentsImpl;
-using content::WebUI;
-using content::WebUIController;
-
+namespace content {
 namespace {
 
 const char kSameAsAnyInstanceURL[] = "about:internets";
 
 const char kPrivilegedScheme[] = "privileged";
 
-class SiteInstanceTestWebUIControllerFactory
-    : public content::WebUIControllerFactory {
+class SiteInstanceTestWebUIControllerFactory : public WebUIControllerFactory {
  public:
   virtual WebUIController* CreateWebUIControllerForURL(
       WebUI* web_ui, const GURL& url) const OVERRIDE {
@@ -59,11 +47,11 @@ class SiteInstanceTestWebUIControllerFactory
   }
   virtual bool UseWebUIForURL(BrowserContext* browser_context,
                               const GURL& url) const OVERRIDE {
-    return content::GetContentClient()->HasWebUIScheme(url);
+    return GetContentClient()->HasWebUIScheme(url);
   }
   virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
                                       const GURL& url) const OVERRIDE {
-    return content::GetContentClient()->HasWebUIScheme(url);
+    return GetContentClient()->HasWebUIScheme(url);
   }
   virtual bool IsURLAcceptableForWebUI(
       BrowserContext* browser_context,
@@ -83,18 +71,17 @@ class SiteInstanceTestClient : public TestContentClient {
   }
 };
 
-class SiteInstanceTestBrowserClient : public content::TestContentBrowserClient {
+class SiteInstanceTestBrowserClient : public TestContentBrowserClient {
  public:
   SiteInstanceTestBrowserClient()
       : privileged_process_id_(-1) {
   }
 
-  virtual content::WebUIControllerFactory*
-      GetWebUIControllerFactory() OVERRIDE {
+  virtual WebUIControllerFactory* GetWebUIControllerFactory() OVERRIDE {
     return &factory_;
   }
 
-  virtual bool IsSuitableHost(content::RenderProcessHost* process_host,
+  virtual bool IsSuitableHost(RenderProcessHost* process_host,
                               const GURL& site_url) OVERRIDE {
     return (privileged_process_id_ == process_host->GetID()) ==
         site_url.SchemeIs(kPrivilegedScheme);
@@ -113,28 +100,28 @@ class SiteInstanceTest : public testing::Test {
  public:
   SiteInstanceTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
-        file_user_blocking_thread_(content::BrowserThread::FILE_USER_BLOCKING,
+        file_user_blocking_thread_(BrowserThread::FILE_USER_BLOCKING,
                                    &message_loop_),
-        io_thread_(content::BrowserThread::IO, &message_loop_),
+        io_thread_(BrowserThread::IO, &message_loop_),
         old_client_(NULL),
         old_browser_client_(NULL) {
   }
 
   virtual void SetUp() {
-    old_client_ = content::GetContentClient();
-    old_browser_client_ = content::GetContentClient()->browser();
-    content::SetContentClient(&client_);
-    content::GetContentClient()->set_browser_for_testing(&browser_client_);
+    old_client_ = GetContentClient();
+    old_browser_client_ = GetContentClient()->browser();
+    SetContentClient(&client_);
+    GetContentClient()->set_browser_for_testing(&browser_client_);
     url_util::AddStandardScheme(kPrivilegedScheme);
     url_util::AddStandardScheme(chrome::kChromeUIScheme);
   }
 
   virtual void TearDown() {
     // Ensure that no RenderProcessHosts are left over after the tests.
-    EXPECT_TRUE(content::RenderProcessHost::AllHostsIterator().IsAtEnd());
+    EXPECT_TRUE(RenderProcessHost::AllHostsIterator().IsAtEnd());
 
-    content::GetContentClient()->set_browser_for_testing(old_browser_client_);
-    content::SetContentClient(old_client_);
+    GetContentClient()->set_browser_for_testing(old_browser_client_);
+    SetContentClient(old_client_);
 
     // http://crbug.com/143565 found SiteInstanceTest leaking an
     // AppCacheDatabase. This happens because some part of the test indirectly
@@ -162,14 +149,14 @@ class SiteInstanceTest : public testing::Test {
 
  private:
   MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_user_blocking_thread_;
-  content::TestBrowserThread io_thread_;
+  TestBrowserThread ui_thread_;
+  TestBrowserThread file_user_blocking_thread_;
+  TestBrowserThread io_thread_;
 
   SiteInstanceTestClient client_;
   SiteInstanceTestBrowserClient browser_client_;
-  content::ContentClient* old_client_;
-  content::ContentBrowserClient* old_browser_client_;
+  ContentClient* old_client_;
+  ContentBrowserClient* old_browser_client_;
 };
 
 // Subclass of BrowsingInstance that updates a counter when deleted and
@@ -224,7 +211,7 @@ class TestSiteInstance : public SiteInstanceImpl {
 TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
   // The existence of this object will cause WebContentsImpl to create our
   // test one instead of the real one.
-  content::RenderViewHostTestEnabler rvh_test_enabler;
+  RenderViewHostTestEnabler rvh_test_enabler;
   int site_delete_counter = 0;
   int browsing_delete_counter = 0;
   const GURL url("test:foo");
@@ -236,8 +223,7 @@ TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
   EXPECT_EQ(0, site_delete_counter);
 
   NavigationEntryImpl* e1 = new NavigationEntryImpl(
-      instance, 0, url, content::Referrer(), string16(),
-      content::PAGE_TRANSITION_LINK, false);
+      instance, 0, url, Referrer(), string16(), PAGE_TRANSITION_LINK, false);
 
   // Redundantly setting e1's SiteInstance shouldn't affect the ref count.
   e1->set_site_instance(instance);
@@ -245,8 +231,7 @@ TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
 
   // Add a second reference
   NavigationEntryImpl* e2 = new NavigationEntryImpl(
-      instance, 0, url, content::Referrer(), string16(),
-      content::PAGE_TRANSITION_LINK, false);
+      instance, 0, url, Referrer(), string16(), PAGE_TRANSITION_LINK, false);
 
   // Now delete both entries and be sure the SiteInstance goes away.
   delete e1;
@@ -259,8 +244,7 @@ TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
   // browsing_instance is now deleted
 
   // Ensure that instances are deleted when their RenderViewHosts are gone.
-  scoped_ptr<content::TestBrowserContext> browser_context(
-      new content::TestBrowserContext());
+  scoped_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
   instance =
       TestSiteInstance::CreateTestSiteInstance(browser_context.get(),
                                                &site_delete_counter,
@@ -299,8 +283,7 @@ TEST_F(SiteInstanceTest, CloneNavigationEntry) {
                                                &browsing_delete_counter);
 
   NavigationEntryImpl* e1 = new NavigationEntryImpl(
-      instance1, 0, url, content::Referrer(), string16(),
-      content::PAGE_TRANSITION_LINK, false);
+      instance1, 0, url, Referrer(), string16(), PAGE_TRANSITION_LINK, false);
   // Clone the entry
   NavigationEntryImpl* e2 = new NavigationEntryImpl(*e1);
 
@@ -327,9 +310,8 @@ TEST_F(SiteInstanceTest, CloneNavigationEntry) {
 // Test to ensure GetProcess returns and creates processes correctly.
 TEST_F(SiteInstanceTest, GetProcess) {
   // Ensure that GetProcess returns a process.
-  scoped_ptr<content::TestBrowserContext> browser_context(
-      new content::TestBrowserContext());
-  scoped_ptr<content::RenderProcessHost> host1;
+  scoped_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
+  scoped_ptr<RenderProcessHost> host1;
   scoped_refptr<SiteInstanceImpl> instance(static_cast<SiteInstanceImpl*>(
       SiteInstance::Create(browser_context.get())));
   host1.reset(instance->GetProcess());
@@ -338,7 +320,7 @@ TEST_F(SiteInstanceTest, GetProcess) {
   // Ensure that GetProcess creates a new process.
   scoped_refptr<SiteInstanceImpl> instance2(static_cast<SiteInstanceImpl*>(
       SiteInstance::Create(browser_context.get())));
-  scoped_ptr<content::RenderProcessHost> host2(instance2->GetProcess());
+  scoped_ptr<RenderProcessHost> host2(instance2->GetProcess());
   EXPECT_TRUE(host2.get() != NULL);
   EXPECT_NE(host1.get(), host2.get());
 
@@ -429,8 +411,7 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSite) {
   ASSERT_FALSE(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kProcessPerSite));
   int delete_counter = 0;
-  scoped_ptr<content::TestBrowserContext> browser_context(
-      new content::TestBrowserContext());
+  scoped_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
   TestBrowsingInstance* browsing_instance =
       new TestBrowsingInstance(browser_context.get(), &delete_counter);
 
@@ -473,10 +454,8 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSite) {
 
   // The two SiteInstances for http://google.com should not use the same process
   // if process-per-site is not enabled.
-  scoped_ptr<content::RenderProcessHost> process_a1(
-      site_instance_a1->GetProcess());
-  scoped_ptr<content::RenderProcessHost> process_a2_2(
-      site_instance_a2_2->GetProcess());
+  scoped_ptr<RenderProcessHost> process_a1(site_instance_a1->GetProcess());
+  scoped_ptr<RenderProcessHost> process_a2_2(site_instance_a2_2->GetProcess());
   EXPECT_NE(process_a1.get(), process_a2_2.get());
 
   // Should be able to see that we do have SiteInstances.
@@ -505,8 +484,7 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSiteInBrowserContext) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kProcessPerSite);
   int delete_counter = 0;
-  scoped_ptr<content::TestBrowserContext> browser_context(
-      new content::TestBrowserContext());
+  scoped_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
   TestBrowsingInstance* browsing_instance =
       new TestBrowsingInstance(browser_context.get(), &delete_counter);
 
@@ -515,8 +493,7 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSiteInBrowserContext) {
       static_cast<SiteInstanceImpl*>(
           browsing_instance->GetSiteInstanceForURL(url_a1)));
   EXPECT_TRUE(site_instance_a1.get() != NULL);
-  scoped_ptr<content::RenderProcessHost> process_a1(
-      site_instance_a1->GetProcess());
+  scoped_ptr<RenderProcessHost> process_a1(site_instance_a1->GetProcess());
 
   // A separate site should create a separate SiteInstance.
   const GURL url_b1("http://www.yahoo.com/");
@@ -551,16 +528,14 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSiteInBrowserContext) {
 
   // A visit to the original site in a new BrowsingInstance (different browser
   // context) should return a different SiteInstance with a different process.
-  scoped_ptr<content::TestBrowserContext> browser_context2(
-      new content::TestBrowserContext());
+  scoped_ptr<TestBrowserContext> browser_context2(new TestBrowserContext());
   TestBrowsingInstance* browsing_instance3 =
       new TestBrowsingInstance(browser_context2.get(), &delete_counter);
   scoped_refptr<SiteInstanceImpl> site_instance_a2_3(
       static_cast<SiteInstanceImpl*>(
           browsing_instance3->GetSiteInstanceForURL(url_a2)));
   EXPECT_TRUE(site_instance_a2_3.get() != NULL);
-  scoped_ptr<content::RenderProcessHost> process_a2_3(
-      site_instance_a2_3->GetProcess());
+  scoped_ptr<RenderProcessHost> process_a2_3(site_instance_a2_3->GetProcess());
   EXPECT_NE(site_instance_a1.get(), site_instance_a2_3.get());
   EXPECT_NE(process_a1.get(), process_a2_3.get());
 
@@ -587,8 +562,8 @@ TEST_F(SiteInstanceTest, OneSiteInstancePerSiteInBrowserContext) {
 }
 
 static SiteInstanceImpl* CreateSiteInstance(
-    content::BrowserContext* browser_context,
-    content::RenderProcessHostFactory* factory,
+    BrowserContext* browser_context,
+    RenderProcessHostFactory* factory,
     const GURL& url) {
   SiteInstanceImpl* instance =
       reinterpret_cast<SiteInstanceImpl*>(
@@ -605,10 +580,9 @@ TEST_F(SiteInstanceTest, ProcessSharingByType) {
       ChildProcessSecurityPolicyImpl::GetInstance();
 
   // Make a bunch of mock renderers so that we hit the limit.
-  scoped_ptr<content::TestBrowserContext> browser_context(
-      new content::TestBrowserContext());
+  scoped_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
   std::vector<MockRenderProcessHost*> hosts;
-  for (size_t i = 0; i < content::kMaxRendererProcessCount; ++i)
+  for (size_t i = 0; i < kMaxRendererProcessCount; ++i)
     hosts.push_back(new MockRenderProcessHost(browser_context.get()));
 
   // Create some extension instances and make sure they share a process.
@@ -621,7 +595,7 @@ TEST_F(SiteInstanceTest, ProcessSharingByType) {
       CreateSiteInstance(browser_context.get(), &rph_factory,
           GURL(kPrivilegedScheme + std::string("://baz/bar"))));
 
-  scoped_ptr<content::RenderProcessHost> extension_host(
+  scoped_ptr<RenderProcessHost> extension_host(
       extension1_instance->GetProcess());
   EXPECT_EQ(extension1_instance->GetProcess(),
             extension2_instance->GetProcess());
@@ -636,14 +610,13 @@ TEST_F(SiteInstanceTest, ProcessSharingByType) {
       browser_context.get(), &rph_factory,
       GURL(chrome::kChromeUIScheme + std::string("://history"))));
 
-  scoped_ptr<content::RenderProcessHost> dom_host(
-      webui1_instance->GetProcess());
+  scoped_ptr<RenderProcessHost> dom_host(webui1_instance->GetProcess());
   EXPECT_EQ(webui1_instance->GetProcess(), webui2_instance->GetProcess());
 
   // Make sure none of differing privilege processes are mixed.
   EXPECT_NE(extension1_instance->GetProcess(), webui1_instance->GetProcess());
 
-  for (size_t i = 0; i < content::kMaxRendererProcessCount; ++i) {
+  for (size_t i = 0; i < kMaxRendererProcessCount; ++i) {
     EXPECT_NE(extension1_instance->GetProcess(), hosts[i]);
     EXPECT_NE(webui1_instance->GetProcess(), hosts[i]);
   }
@@ -656,9 +629,8 @@ TEST_F(SiteInstanceTest, ProcessSharingByType) {
 // Test to ensure that HasWrongProcessForURL behaves properly for different
 // types of URLs.
 TEST_F(SiteInstanceTest, HasWrongProcessForURL) {
-  scoped_ptr<content::TestBrowserContext> browser_context(
-      new content::TestBrowserContext());
-  scoped_ptr<content::RenderProcessHost> host;
+  scoped_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
+  scoped_ptr<RenderProcessHost> host;
   scoped_refptr<SiteInstanceImpl> instance(static_cast<SiteInstanceImpl*>(
       SiteInstance::Create(browser_context.get())));
 
@@ -686,3 +658,5 @@ TEST_F(SiteInstanceTest, HasWrongProcessForURL) {
 
   DrainMessageLoops();
 }
+
+}  // namespace content
diff --git a/content/public/test/accessibility_test_utils_win.cc b/content/public/test/accessibility_test_utils_win.cc
index 9c3f187..b98d7ce 100644
--- a/content/public/test/accessibility_test_utils_win.cc
+++ b/content/public/test/accessibility_test_utils_win.cc
@@ -13,6 +13,7 @@
 #include "base/string_util.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 
+namespace content {
 namespace {
 
 class AccessibilityRoleStateMap {
@@ -263,3 +264,5 @@ string16 IAccessible2StateToString(int32 ia2_state) {
   IAccessible2StateToStringVector(ia2_state, &strings);
   return JoinString(strings, ',');
 }
+
+}  // namespace content
diff --git a/content/public/test/accessibility_test_utils_win.h b/content/public/test/accessibility_test_utils_win.h
index e1b9b8f..55bff66 100644
--- a/content/public/test/accessibility_test_utils_win.h
+++ b/content/public/test/accessibility_test_utils_win.h
@@ -10,6 +10,8 @@
 #include "base/basictypes.h"
 #include "base/string16.h"
 
+namespace content {
+
 string16 IAccessibleRoleToString(int32 ia_role);
 string16 IAccessible2RoleToString(int32 ia_role);
 string16 IAccessibleStateToString(int32 ia_state);
@@ -19,4 +21,6 @@ string16 IAccessible2StateToString(int32 ia2_state);
 void IAccessible2StateToStringVector(int32 ia_state,
                                      std::vector<string16>* result);
 
+}  // namespace content
+
 #endif  // CONTENT_PUBLIC_TEST_ACCESSIBILITY_TEST_UTILS_WIN_H_
diff --git a/content/public/test/mock_download_manager.cc b/content/public/test/mock_download_manager.cc
index a2e63a4..64349fd 100644
--- a/content/public/test/mock_download_manager.cc
+++ b/content/public/test/mock_download_manager.cc
@@ -16,9 +16,9 @@ MockDownloadManager::MockDownloadManager() {}
 
 MockDownloadManager::~MockDownloadManager() {}
 
-content::DownloadItem* MockDownloadManager::StartDownload(
+DownloadItem* MockDownloadManager::StartDownload(
     scoped_ptr<DownloadCreateInfo> info,
-    scoped_ptr<content::ByteStreamReader> stream) {
+    scoped_ptr<ByteStreamReader> stream) {
   return MockStartDownload(info.get(), stream.get());
 }
 
diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc
index 9b9ca47..304af45 100644
--- a/content/public/test/mock_render_process_host.cc
+++ b/content/public/test/mock_render_process_host.cc
@@ -184,7 +184,7 @@ bool MockRenderProcessHost::SuddenTerminationAllowed() const {
   return true;
 }
 
-content::RenderWidgetHost* MockRenderProcessHost::GetRenderWidgetHostByID(
+RenderWidgetHost* MockRenderProcessHost::GetRenderWidgetHostByID(
     int routing_id) {
   return render_widget_hosts_.Lookup(routing_id);
 }
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index 0d7576d..b6171c3 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -119,15 +119,14 @@ void MockRenderThread::SetOutgoingMessageFilter(
     IPC::ChannelProxy::OutgoingMessageFilter* filter) {
 }
 
-void MockRenderThread::AddObserver(content::RenderProcessObserver* observer) {
+void MockRenderThread::AddObserver(RenderProcessObserver* observer) {
 }
 
-void MockRenderThread::RemoveObserver(
-    content::RenderProcessObserver* observer) {
+void MockRenderThread::RemoveObserver(RenderProcessObserver* observer) {
 }
 
 void MockRenderThread::SetResourceDispatcherDelegate(
-    content::ResourceDispatcherDelegate* delegate) {
+    ResourceDispatcherDelegate* delegate) {
 }
 
 void MockRenderThread::WidgetHidden() {
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 1fed30d..2c3a907 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -33,7 +33,6 @@ using WebKit::WebScriptController;
 using WebKit::WebScriptSource;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
-using content::NativeWebKeyboardEvent;
 
 namespace {
 const int32 kOpenerId = -2;
@@ -137,7 +136,7 @@ void RenderViewTest::SetUp() {
   render_thread_->set_new_window_routing_id(kNewWindowRouteId);
 
   command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM));
-  params_.reset(new content::MainFunctionParams(*command_line_));
+  params_.reset(new MainFunctionParams(*command_line_));
   platform_.reset(new RendererMainPlatformDelegate(*params_));
   platform_->PlatformInitialize();
 
@@ -163,7 +162,7 @@ void RenderViewTest::SetUp() {
   RenderViewImpl* view = RenderViewImpl::Create(
       0,
       kOpenerId,
-      content::RendererPreferences(),
+      RendererPreferences(),
       webkit_glue::WebPreferences(),
       new SharedRenderViewCounter(0),
       kRouteId,
@@ -355,7 +354,7 @@ void RenderViewTest::GoToOffset(int offset,
 
   ViewMsg_Navigate_Params navigate_params;
   navigate_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
-  navigate_params.transition = content::PAGE_TRANSITION_FORWARD_BACK;
+  navigate_params.transition = PAGE_TRANSITION_FORWARD_BACK;
   navigate_params.current_history_list_length = history_list_length;
   navigate_params.current_history_list_offset = impl->history_list_offset();
   navigate_params.pending_history_list_offset = pending_offset;
diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h
index c8d7ca5..b1ee82e 100644
--- a/content/public/test/render_view_test.h
+++ b/content/public/test/render_view_test.h
@@ -79,7 +79,7 @@ class RenderViewTest : public testing::Test {
   void GoForward(const WebKit::WebHistoryItem& item);
 
   // Sends one native key event over IPC.
-  void SendNativeKeyEvent(const content::NativeWebKeyboardEvent& key_event);
+  void SendNativeKeyEvent(const NativeWebKeyboardEvent& key_event);
 
   // Send a raw keyboard event to the renderer.
   void SendWebKeyboardEvent(const WebKit::WebKeyboardEvent& key_event);
@@ -128,14 +128,14 @@ class RenderViewTest : public testing::Test {
   scoped_ptr<MockRenderProcess> mock_process_;
   // We use a naked pointer because we don't want to expose RenderViewImpl in
   // the embedder's namespace.
-  content::RenderView* view_;
+  RenderView* view_;
   RendererWebKitPlatformSupportImplNoSandbox webkit_platform_support_;
   ContentRendererClient content_renderer_client_;
   scoped_ptr<MockRenderThread> render_thread_;
 
   // Used to setup the process so renderers can run.
   scoped_ptr<RendererMainPlatformDelegate> platform_;
-  scoped_ptr<content::MainFunctionParams> params_;
+  scoped_ptr<MainFunctionParams> params_;
   scoped_ptr<CommandLine> command_line_;
 
  private:
diff --git a/content/public/test/test_content_client_initializer.cc b/content/public/test/test_content_client_initializer.cc
index 39fb4a02..b2ecdfe 100644
--- a/content/public/test/test_content_client_initializer.cc
+++ b/content/public/test/test_content_client_initializer.cc
@@ -38,9 +38,9 @@ TestContentClientInitializer::~TestContentClientInitializer() {
 
 void TestContentClientInitializer::CreateTestRenderViewHosts() {
 #if !defined(OS_IOS)
-  rph_factory_.reset(new content::MockRenderProcessHostFactory());
+  rph_factory_.reset(new MockRenderProcessHostFactory());
   test_render_view_host_factory_.reset(
-      new content::TestRenderViewHostFactory(rph_factory_.get()));
+      new TestRenderViewHostFactory(rph_factory_.get()));
 #endif  // OS_IOS
 }
 
diff --git a/content/public/test/test_content_client_initializer.h b/content/public/test/test_content_client_initializer.h
index 9bb1ffe..22a69a2 100644
--- a/content/public/test/test_content_client_initializer.h
+++ b/content/public/test/test_content_client_initializer.h
@@ -34,7 +34,7 @@ class TestContentClientInitializer {
   scoped_ptr<NotificationServiceImpl> notification_service_;
   scoped_ptr<ContentClient> content_client_;
   scoped_ptr<TestContentBrowserClient> content_browser_client_;
-  scoped_ptr<content::MockRenderProcessHostFactory> rph_factory_;
+  scoped_ptr<MockRenderProcessHostFactory> rph_factory_;
   scoped_ptr<TestRenderViewHostFactory> test_render_view_host_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestContentClientInitializer);
diff --git a/content/public/test/test_navigation_observer.cc b/content/public/test/test_navigation_observer.cc
index b3b3a17..590d8a7 100644
--- a/content/public/test/test_navigation_observer.cc
+++ b/content/public/test/test_navigation_observer.cc
@@ -89,7 +89,7 @@ void TestNavigationObserver::Wait() {
   base::RunLoop run_loop;
   WaitForObservation(
       base::Bind(&base::RunLoop::Run, base::Unretained(&run_loop)),
-      content::GetQuitTaskForRunLoop(&run_loop));
+      GetQuitTaskForRunLoop(&run_loop));
 }
 
 TestNavigationObserver::TestNavigationObserver(
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
index be4328e..cf0e0ec 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -125,7 +125,7 @@ WebContents* RenderViewHostTestHarness::CreateTestWebContents() {
 
   // See comment above browser_context_ decl for why we check for NULL here.
   if (!browser_context_.get())
-    browser_context_.reset(new content::TestBrowserContext());
+    browser_context_.reset(new TestBrowserContext());
 
   // This will be deleted when the WebContentsImpl goes away.
   SiteInstance* instance = SiteInstance::Create(browser_context_.get());
diff --git a/content/public/test/web_contents_tester.cc b/content/public/test/web_contents_tester.cc
index e2b249b..eed75ec 100644
--- a/content/public/test/web_contents_tester.cc
+++ b/content/public/test/web_contents_tester.cc
@@ -15,7 +15,7 @@ namespace {
 
 class TestWebContentsCountFocus : public TestWebContents {
  public:
-  explicit TestWebContentsCountFocus(content::BrowserContext* browser_context)
+  explicit TestWebContentsCountFocus(BrowserContext* browser_context)
       : TestWebContents(browser_context), focus_called_(0) {
   }
 
@@ -34,7 +34,7 @@ class TestWebContentsCountFocus : public TestWebContents {
 class TestWebContentsCountSetFocusToLocationBar : public TestWebContents {
  public:
   explicit TestWebContentsCountSetFocusToLocationBar(
-      content::BrowserContext* browser_context)
+      BrowserContext* browser_context)
       : TestWebContents(browser_context), focus_called_(0) {
   }
 
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index f7eeed6..0e6841f 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -60,7 +60,7 @@ void ContentBrowserTest::SetUp() {
   // and set up renderer.
   if (command_line->HasSwitch(switches::kSingleProcess)) {
     single_process_renderer_client_.reset(new ShellContentRendererClient);
-    content::GetContentClient()->set_renderer_for_testing(
+    GetContentClient()->set_renderer_for_testing(
         single_process_renderer_client_.get());
   }
 
diff --git a/content/test/content_browser_test.h b/content/test/content_browser_test.h
index 6217f2d..a9c48d1 100644
--- a/content/test/content_browser_test.h
+++ b/content/test/content_browser_test.h
@@ -39,7 +39,7 @@ class ContentBrowserTest : public BrowserTestBase {
   Shell* shell() const { return shell_; }
 
  private:
-  scoped_ptr<content::ShellMainDelegate> shell_main_delegate_;
+  scoped_ptr<ShellMainDelegate> shell_main_delegate_;
 
   Shell* shell_;
 
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 6e8c4ae..5eebd690 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -101,7 +101,7 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate {
   }
 
  protected:
-  virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
+  virtual ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
     return new ShellMainDelegate();
   }
 
diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc
index 6bce93c..9d4e628 100644
--- a/content/test/layout_browsertest.cc
+++ b/content/test/layout_browsertest.cc
@@ -39,6 +39,7 @@ static const char kPlatformName[] = "chromium-openbsd";
 #error No known OS defined
 #endif
 
+namespace content {
 namespace {
 
 bool ReadExpectedResult(const FilePath& result_dir_path,
@@ -75,7 +76,7 @@ InProcessBrowserLayoutTest::~InProcessBrowserLayoutTest() {
 
 void InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture() {
   FilePath src_dir;
-  ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &src_dir));
+  ASSERT_TRUE(PathService::Get(DIR_LAYOUT_TESTS, &src_dir));
   FilePath absolute_parent_dir = src_dir.Append(test_parent_dir_);
   ASSERT_TRUE(file_util::DirectoryExists(absolute_parent_dir));
   layout_test_dir_ = absolute_parent_dir.Append(test_case_dir_);
@@ -124,7 +125,7 @@ void InProcessBrowserLayoutTest::SetUpCommandLine(CommandLine* command_line) {
 }
 
 void InProcessBrowserLayoutTest::SetUpOnMainThread() {
-  test_controller_.reset(new content::WebKitTestController);
+  test_controller_.reset(new WebKitTestController);
 }
 
 void InProcessBrowserLayoutTest::RunLayoutTest(
@@ -146,8 +147,8 @@ void InProcessBrowserLayoutTest::RunHttpLayoutTest(
 void InProcessBrowserLayoutTest::RunLayoutTestInternal(
     const std::string& test_case_file_name, const GURL& url) {
   std::stringstream result;
-  scoped_ptr<content::WebKitTestResultPrinter> printer(
-      new content::WebKitTestResultPrinter(&result, NULL));
+  scoped_ptr<WebKitTestResultPrinter> printer(
+      new WebKitTestResultPrinter(&result, NULL));
   printer->set_capture_text_only(true);
   test_controller_->set_printer(printer.release());
 
@@ -204,3 +205,5 @@ std::string InProcessBrowserLayoutTest::SaveResults(const std::string& expected,
                       expected_filename.value().c_str(),
                       actual_filename.value().c_str());
 }
+
+}  // namespace content
diff --git a/content/test/layout_browsertest.h b/content/test/layout_browsertest.h
index c406466..0f05ab0 100644
--- a/content/test/layout_browsertest.h
+++ b/content/test/layout_browsertest.h
@@ -7,12 +7,12 @@
 #include "content/test/content_browser_test.h"
 
 class GURL;
-class LayoutTestHttpServer;
+
 namespace content {
+class LayoutTestHttpServer;
 class WebKitTestController;
-}
 
-class InProcessBrowserLayoutTest : public content::ContentBrowserTest {
+class InProcessBrowserLayoutTest : public ContentBrowserTest {
  public:
   explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir,
                                       const FilePath& test_case_dir);
@@ -53,7 +53,9 @@ class InProcessBrowserLayoutTest : public content::ContentBrowserTest {
   int port_;  // -2 means no port.  -1 means random.
   scoped_ptr<LayoutTestHttpServer> test_http_server_;
 
-  scoped_ptr<content::WebKitTestController> test_controller_;
+  scoped_ptr<WebKitTestController> test_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest);
 };
+
+}  // namespace content
diff --git a/content/test/layout_test_http_server.cc b/content/test/layout_test_http_server.cc
index 37f04e4..603a479 100644
--- a/content/test/layout_test_http_server.cc
+++ b/content/test/layout_test_http_server.cc
@@ -16,6 +16,7 @@
 #include "base/win/windows_version.h"
 #endif
 
+namespace content {
 namespace {
 
 bool PrepareCommandLine(CommandLine* cmd_line) {
@@ -67,7 +68,7 @@ bool LayoutTestHttpServer::Start() {
   cmd_line.AppendArg("--port=" + base::IntToString(port_));
 
   FilePath layout_tests_dir;
-  if (!PathService::Get(content::DIR_LAYOUT_TESTS, &layout_tests_dir))
+  if (!PathService::Get(DIR_LAYOUT_TESTS, &layout_tests_dir))
     return false;
   cmd_line.AppendArgNative(FILE_PATH_LITERAL("--layout_tests_dir=") +
                            layout_tests_dir.value());
@@ -130,3 +131,5 @@ bool LayoutTestHttpServer::Stop() {
 
   return stopped;
 }
+
+}  // namespace content
diff --git a/content/test/layout_test_http_server.h b/content/test/layout_test_http_server.h
index 5b76685..709c1ec 100644
--- a/content/test/layout_test_http_server.h
+++ b/content/test/layout_test_http_server.h
@@ -12,6 +12,8 @@
 #include "base/win/scoped_handle.h"
 #endif
 
+namespace content {
+
 // This object bounds the lifetime of an external HTTP server
 // used for layout tests.
 //
@@ -50,4 +52,6 @@ class LayoutTestHttpServer {
   DISALLOW_COPY_AND_ASSIGN(LayoutTestHttpServer);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_LAYOUT_TEST_HTTP_SERVER_H_
diff --git a/content/test/mock_keyboard.cc b/content/test/mock_keyboard.cc
index 0862a31..55b695d 100644
--- a/content/test/mock_keyboard.cc
+++ b/content/test/mock_keyboard.cc
@@ -6,6 +6,8 @@
 
 #include "base/logging.h"
 
+namespace content {
+
 MockKeyboard::MockKeyboard()
     : keyboard_layout_(LAYOUT_NULL),
       keyboard_modifiers_(INVALID) {
@@ -45,3 +47,5 @@ int MockKeyboard::GetCharacters(Layout layout,
   return -1;
 #endif
 }
+
+}  // namespace content
diff --git a/content/test/mock_keyboard.h b/content/test/mock_keyboard.h
index 405ca2a..a77875b 100644
--- a/content/test/mock_keyboard.h
+++ b/content/test/mock_keyboard.h
@@ -13,6 +13,8 @@
 #include "content/test/mock_keyboard_driver_win.h"
 #endif
 
+namespace content {
+
 // A mock keyboard interface.
 // This class defines a pseudo keyboard device, which implements mappings from
 // a tuple (layout, key code, modifiers) to Unicode characters so that
@@ -103,4 +105,6 @@ class MockKeyboard {
   DISALLOW_COPY_AND_ASSIGN(MockKeyboard);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_MOCK_KEYBOARD_H_
diff --git a/content/test/mock_keyboard_driver_win.cc b/content/test/mock_keyboard_driver_win.cc
index 9d57fb3..7979daf 100644
--- a/content/test/mock_keyboard_driver_win.cc
+++ b/content/test/mock_keyboard_driver_win.cc
@@ -8,6 +8,8 @@
 #include "base/logging.h"
 #include "content/test/mock_keyboard.h"
 
+namespace content {
+
 MockKeyboardDriverWin::MockKeyboardDriverWin() {
   // Save the keyboard layout and status of the application.
   // This class changes the keyboard layout and status of this application.
@@ -161,3 +163,5 @@ int MockKeyboardDriverWin::GetCharacters(int key_code,
     output->assign(code);
   return length;
 }
+
+}  // namespace content
diff --git a/content/test/mock_keyboard_driver_win.h b/content/test/mock_keyboard_driver_win.h
index d615729..15150dd 100644
--- a/content/test/mock_keyboard_driver_win.h
+++ b/content/test/mock_keyboard_driver_win.h
@@ -11,6 +11,8 @@
 #include <vector>
 #include "base/basictypes.h"
 
+namespace content {
+
 // Implements the platform-dependent part of a pseudo keyboard device for
 // Windows.
 class MockKeyboardDriverWin {
@@ -38,4 +40,6 @@ class MockKeyboardDriverWin {
   DISALLOW_COPY_AND_ASSIGN(MockKeyboardDriverWin);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_MOCK_KEYBOARD_DRIVER_WIN_H_
diff --git a/content/test/net/url_request_abort_on_end_job.cc b/content/test/net/url_request_abort_on_end_job.cc
index 17312ad..67d10a4 100644
--- a/content/test/net/url_request_abort_on_end_job.cc
+++ b/content/test/net/url_request_abort_on_end_job.cc
@@ -17,6 +17,7 @@
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_status.h"
 
+namespace content {
 namespace {
 const char kPageContent[] = "some data\r\n";
 }
@@ -36,7 +37,7 @@ net::URLRequestJob* URLRequestAbortOnEndJob::Factory(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     const std::string& scheme) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return new URLRequestAbortOnEndJob(request, network_delegate);
 }
 
@@ -105,4 +106,4 @@ bool URLRequestAbortOnEndJob::ReadRawData(net::IOBuffer* buf,
   return false;
 }
 
-
+}  // namespace content
diff --git a/content/test/net/url_request_abort_on_end_job.h b/content/test/net/url_request_abort_on_end_job.h
index e1045a28..b3d9375 100644
--- a/content/test/net/url_request_abort_on_end_job.h
+++ b/content/test/net/url_request_abort_on_end_job.h
@@ -13,6 +13,8 @@
 #include "base/memory/weak_ptr.h"
 #include "net/url_request/url_request_job.h"
 
+namespace content {
+
 // This url request simulates a network error which occurs immediately after
 // receiving the very first data.
 
@@ -49,4 +51,6 @@ class URLRequestAbortOnEndJob : public net::URLRequestJob {
   DISALLOW_COPY_AND_ASSIGN(URLRequestAbortOnEndJob);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_NET_URL_REQUEST_ABORT_ON_END_JOB_H_
diff --git a/content/test/net/url_request_failed_job.cc b/content/test/net/url_request_failed_job.cc
index 0283386..79df121 100644
--- a/content/test/net/url_request_failed_job.cc
+++ b/content/test/net/url_request_failed_job.cc
@@ -12,6 +12,7 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
 
+namespace content {
 namespace {
 
 const char kMockHostname[] = "mock.failed.request";
@@ -89,3 +90,5 @@ void URLRequestFailedJob::StartAsync() {
   NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
                                          net_error_));
 }
+
+}  // namespace content
diff --git a/content/test/net/url_request_failed_job.h b/content/test/net/url_request_failed_job.h
index 39ab9d0f..fd8b435 100644
--- a/content/test/net/url_request_failed_job.h
+++ b/content/test/net/url_request_failed_job.h
@@ -12,6 +12,8 @@
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_job.h"
 
+namespace content {
+
 // This class simulates a URLRequestJob failing with a given error code while
 // trying to connect.
 class URLRequestFailedJob : public net::URLRequestJob {
@@ -48,4 +50,6 @@ class URLRequestFailedJob : public net::URLRequestJob {
   DISALLOW_COPY_AND_ASSIGN(URLRequestFailedJob);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_NET_URL_REQUEST_FAILED_JOB_H_
diff --git a/content/test/net/url_request_mock_http_job.cc b/content/test/net/url_request_mock_http_job.cc
index 5a4d28d..c36804a 100644
--- a/content/test/net/url_request_mock_http_job.cc
+++ b/content/test/net/url_request_mock_http_job.cc
@@ -29,6 +29,8 @@ FilePath& BasePath() {
 
 }  // namespace
 
+namespace content {
+
 // static
 net::URLRequestJob* URLRequestMockHTTPJob::Factory(
     net::URLRequest* request,
@@ -139,3 +141,5 @@ bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   GetResponseInfo(&info);
   return info.headers && info.headers->GetCharset(charset);
 }
+
+}  // namespace content
diff --git a/content/test/net/url_request_mock_http_job.h b/content/test/net/url_request_mock_http_job.h
index 2c8434c..d6aa295 100644
--- a/content/test/net/url_request_mock_http_job.h
+++ b/content/test/net/url_request_mock_http_job.h
@@ -13,6 +13,8 @@
 
 class FilePath;
 
+namespace content {
+
 class URLRequestMockHTTPJob : public net::URLRequestFileJob {
  public:
   URLRequestMockHTTPJob(net::URLRequest* request,
@@ -50,4 +52,6 @@ class URLRequestMockHTTPJob : public net::URLRequestFileJob {
   void GetResponseInfoConst(net::HttpResponseInfo* info) const;
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
diff --git a/content/test/net/url_request_slow_download_job.cc b/content/test/net/url_request_slow_download_job.cc
index 4d69145..ca1ccc0 100644
--- a/content/test/net/url_request_slow_download_job.cc
+++ b/content/test/net/url_request_slow_download_job.cc
@@ -17,7 +17,7 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
 
-using content::BrowserThread;
+namespace content {
 
 const char URLRequestSlowDownloadJob::kUnknownSizeUrl[] =
   "http://url.handled.by.slow.download/download-unknown-size";
@@ -243,3 +243,5 @@ bool URLRequestSlowDownloadJob::GetMimeType(std::string* mime_type) const {
   GetResponseInfoConst(&info);
   return info.headers && info.headers->GetMimeType(mime_type);
 }
+
+}  // namespace content
diff --git a/content/test/net/url_request_slow_download_job.h b/content/test/net/url_request_slow_download_job.h
index bc7c1ea..5e4e76b 100644
--- a/content/test/net/url_request_slow_download_job.h
+++ b/content/test/net/url_request_slow_download_job.h
@@ -16,6 +16,8 @@
 #include "base/memory/weak_ptr.h"
 #include "net/url_request/url_request_job.h"
 
+namespace content {
+
 class URLRequestSlowDownloadJob : public net::URLRequestJob {
  public:
   // Test URLs.
@@ -94,4 +96,6 @@ class URLRequestSlowDownloadJob : public net::URLRequestJob {
   base::WeakPtrFactory<URLRequestSlowDownloadJob> weak_factory_;
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_NET_URL_REQUEST_SLOW_DOWNLOAD_JOB_H_
diff --git a/content/test/net/url_request_slow_http_job.cc b/content/test/net/url_request_slow_http_job.cc
index b5d30aa..378376c 100644
--- a/content/test/net/url_request_slow_http_job.cc
+++ b/content/test/net/url_request_slow_http_job.cc
@@ -10,6 +10,7 @@
 
 static const char kMockHostname[] = "mock.slow.http";
 
+namespace content {
 namespace {
 
 // This is the file path leading to the root of the directory to use as the
@@ -73,3 +74,5 @@ URLRequestSlowHTTPJob::~URLRequestSlowHTTPJob() {
 void URLRequestSlowHTTPJob::RealStart() {
   URLRequestMockHTTPJob::Start();
 }
+
+}  // namespace content
diff --git a/content/test/net/url_request_slow_http_job.h b/content/test/net/url_request_slow_http_job.h
index cbb2d7e..1772d9f 100644
--- a/content/test/net/url_request_slow_http_job.h
+++ b/content/test/net/url_request_slow_http_job.h
@@ -10,6 +10,8 @@
 #include "base/timer.h"
 #include "content/test/net/url_request_mock_http_job.h"
 
+namespace content {
+
 class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
  public:
   URLRequestSlowHTTPJob(net::URLRequest* request,
@@ -37,4 +39,6 @@ class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
   base::OneShotTimer<URLRequestSlowHTTPJob> delay_timer_;
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_NET_URL_REQUEST_SLOW_HTTP_JOB_H_
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index 7b53960..b111de4 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -10,6 +10,8 @@
 #include "base/path_service.h"
 #include "base/string_piece.h"
 
+namespace content {
+
 TestContentClient::TestContentClient()
     : data_pack_(ui::SCALE_FACTOR_100P) {
   // content_resources.pak is not built on iOS as it is not required.
@@ -43,3 +45,5 @@ base::StringPiece TestContentClient::GetDataResource(
   data_pack_.GetStringPiece(resource_id, &resource);
   return resource;
 }
+
+}  // namespace content
diff --git a/content/test/test_content_client.h b/content/test/test_content_client.h
index 0b4192f..6643192 100644
--- a/content/test/test_content_client.h
+++ b/content/test/test_content_client.h
@@ -12,12 +12,14 @@
 #include "content/public/common/content_client.h"
 #include "ui/base/resource/data_pack.h"
 
-class TestContentClient : public content::ContentClient {
+namespace content {
+
+class TestContentClient : public ContentClient {
  public:
   TestContentClient();
   virtual ~TestContentClient();
 
-  // content::ContentClient:
+  // ContentClient:
   virtual std::string GetUserAgent() const OVERRIDE;
   virtual base::StringPiece GetDataResource(
       int resource_id,
@@ -29,4 +31,6 @@ class TestContentClient : public content::ContentClient {
   DISALLOW_COPY_AND_ASSIGN(TestContentClient);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_TEST_TEST_CONTENT_CLIENT_H_
diff --git a/content/test/test_render_view_host_factory.cc b/content/test/test_render_view_host_factory.cc
index 7a7f33c..3a2b0f3 100644
--- a/content/test/test_render_view_host_factory.cc
+++ b/content/test/test_render_view_host_factory.cc
@@ -11,7 +11,7 @@
 namespace content {
 
 TestRenderViewHostFactory::TestRenderViewHostFactory(
-    content::RenderProcessHostFactory* rph_factory)
+    RenderProcessHostFactory* rph_factory)
     : render_process_host_factory_(rph_factory) {
   RenderViewHostFactory::RegisterFactory(this);
 }
@@ -21,11 +21,11 @@ TestRenderViewHostFactory::~TestRenderViewHostFactory() {
 }
 
 void TestRenderViewHostFactory::set_render_process_host_factory(
-    content::RenderProcessHostFactory* rph_factory) {
+    RenderProcessHostFactory* rph_factory) {
   render_process_host_factory_ = rph_factory;
 }
 
-content::RenderViewHost* TestRenderViewHostFactory::CreateRenderViewHost(
+RenderViewHost* TestRenderViewHostFactory::CreateRenderViewHost(
     SiteInstance* instance,
     RenderViewHostDelegate* delegate,
     RenderWidgetHostDelegate* widget_delegate,
diff --git a/content/test/test_render_view_host_factory.h b/content/test/test_render_view_host_factory.h
index cbab8bc..3a30b46 100644
--- a/content/test/test_render_view_host_factory.h
+++ b/content/test/test_render_view_host_factory.h
@@ -22,19 +22,18 @@ class SessionStorageNamespace;
 // registered at a time, you can only have one of these objects at a time.
 class TestRenderViewHostFactory : public RenderViewHostFactory {
  public:
-  explicit TestRenderViewHostFactory(
-      content::RenderProcessHostFactory* rph_factory);
+  explicit TestRenderViewHostFactory(RenderProcessHostFactory* rph_factory);
   virtual ~TestRenderViewHostFactory();
 
   virtual void set_render_process_host_factory(
-      content::RenderProcessHostFactory* rph_factory);
-  virtual content::RenderViewHost* CreateRenderViewHost(
-      content::SiteInstance* instance,
-      content::RenderViewHostDelegate* delegate,
-      content::RenderWidgetHostDelegate* widget_delegate,
+      RenderProcessHostFactory* rph_factory);
+  virtual RenderViewHost* CreateRenderViewHost(
+      SiteInstance* instance,
+      RenderViewHostDelegate* delegate,
+      RenderWidgetHostDelegate* widget_delegate,
       int routing_id,
       bool swapped_out,
-      content::SessionStorageNamespace* session_storage) OVERRIDE;
+      SessionStorageNamespace* session_storage) OVERRIDE;
 
  private:
   // This is a bit of a hack. With the current design of the site instances /
@@ -44,7 +43,7 @@ class TestRenderViewHostFactory : public RenderViewHostFactory {
   // Instead, we set it right before we create a new RenderViewHost, which
   // happens before the RenderProcessHost is created. This way, the instance
   // has the correct factory and creates our special RenderProcessHosts.
-  content::RenderProcessHostFactory* render_process_host_factory_;
+  RenderProcessHostFactory* render_process_host_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRenderViewHostFactory);
 };
diff --git a/content/test/test_web_contents_view.cc b/content/test/test_web_contents_view.cc
index 1fc17c8..fd69240 100644
--- a/content/test/test_web_contents_view.cc
+++ b/content/test/test_web_contents_view.cc
@@ -12,9 +12,8 @@ TestWebContentsView::TestWebContentsView() {
 TestWebContentsView::~TestWebContentsView() {
 }
 
-void TestWebContentsView::ShowContextMenu(
-    const ContextMenuParams& params,
-    content::ContextMenuSourceType type) {
+void TestWebContentsView::ShowContextMenu(const ContextMenuParams& params,
+                                          ContextMenuSourceType type) {
 }
 
 void TestWebContentsView::ShowPopupMenu(const gfx::Rect& bounds,
diff --git a/content/test/test_web_contents_view.h b/content/test/test_web_contents_view.h
index 0076add..371359a 100644
--- a/content/test/test_web_contents_view.h
+++ b/content/test/test_web_contents_view.h
@@ -18,9 +18,8 @@ class TestWebContentsView : public WebContentsView,
   virtual ~TestWebContentsView();
 
   // RenderViewHostDelegateView:
-  virtual void ShowContextMenu(
-      const ContextMenuParams& params,
-      content::ContextMenuSourceType type) OVERRIDE;
+  virtual void ShowContextMenu(const ContextMenuParams& params,
+                               ContextMenuSourceType type) OVERRIDE;
   virtual void ShowPopupMenu(const gfx::Rect& bounds,
                              int item_height,
                              double item_font_size,
diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h
index e6c7846..31a57da 100644
--- a/content/test/webrtc_audio_device_test.h
+++ b/content/test/webrtc_audio_device_test.h
@@ -159,14 +159,14 @@ class WebRTCAudioDeviceTest : public ::testing::Test, public IPC::Listener {
 
   scoped_ptr<ReplaceContentClientRenderer> saved_content_renderer_;
   MessageLoopForUI message_loop_;
-  content::ContentRendererClient content_renderer_client_;
+  ContentRendererClient content_renderer_client_;
   RenderThreadImpl* render_thread_;  // Owned by mock_process_.
   scoped_ptr<WebRTCMockRenderProcess> mock_process_;
   scoped_ptr<MockMediaObserver> media_observer_;
   scoped_ptr<MediaStreamManager> media_stream_manager_;
   scoped_ptr<media::AudioManager> audio_manager_;
   scoped_ptr<net::URLRequestContext> test_request_context_;
-  scoped_ptr<content::ResourceContext> resource_context_;
+  scoped_ptr<ResourceContext> resource_context_;
   scoped_ptr<IPC::Channel> channel_;
   scoped_refptr<AudioRendererHost> audio_render_host_;
   scoped_refptr<AudioInputRendererHost> audio_input_renderer_host_;
@@ -174,9 +174,9 @@ class WebRTCAudioDeviceTest : public ::testing::Test, public IPC::Listener {
   AudioUtilInterface* audio_util_callback_;  // Weak reference.
 
   // Initialized on the main test thread that we mark as the UI thread.
-  scoped_ptr<content::TestBrowserThread> ui_thread_;
+  scoped_ptr<TestBrowserThread> ui_thread_;
   // Initialized on our IO thread to satisfy BrowserThread::IO checks.
-  scoped_ptr<content::TestBrowserThread> io_thread_;
+  scoped_ptr<TestBrowserThread> io_thread_;
 
 #if defined(OS_WIN)
   // COM initialization on the IO thread.