Move remaining content test code into the content namespace.

chrome/browser/browser_encoding_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 105 matching lines @@
     { "windows-1258.html", "windows-1258" }
   };
   const char* const kAliasTestDir = "alias_mapping";
 
   FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kAliasTestDir);
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kEncodingTestDatas); ++i) {
     FilePath test_file_path(test_dir_path);
     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
     // seen sometimes. Create a new tab for each one.  http://crbug.com/122053
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), url, NEW_FOREGROUND_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
     EXPECT_EQ(kEncodingTestDatas[i].encoding_name,
               chrome::GetActiveWebContents(browser())->GetEncoding());
     chrome::CloseTab(browser());
   }
 }
 
 // Marked as flaky: see  http://crbug.com/44668
 IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
   const char* const kTestFileName = "gb18030_with_iso88591_meta.html";
   const char* const kExpectedFileName =
       "expected_gb18030_saved_from_iso88591_meta.html";
   const char* const kOverrideTestDir = "user_override";
 
   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());
 
   // Override the encoding to "gb18030".
   const std::string selected_encoding =
       CharacterEncoding::GetCanonicalEncodingNameByAliasName("gb18030");
   content::TestNavigationObserver navigation_observer(
       content::Source<content::NavigationController>(
           &web_contents->GetController()));
@@ skipping 93 matching lines @@
                                               "ISO-8859-4");
 
   content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestDatas); ++i) {
     // Disable auto detect if it is on.
     browser()->profile()->GetPrefs()->SetBoolean(
         prefs::kWebKitUsesUniversalDetector, false);
 
     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
     // just set.
     EXPECT_EQ("ISO-8859-4", web_contents->GetEncoding());
 
     // Enable the encoding auto detection.
     browser()->profile()->GetPrefs()->SetBoolean(
         prefs::kWebKitUsesUniversalDetector, true);
 
     content::TestNavigationObserver observer(
         content::Source<content::NavigationController>(
             &web_contents->GetController()));
     chrome::Reload(browser(), CURRENT_TAB);
     observer.Wait();
 
     // Re-get the encoding of page. It should return the real encoding now.
     EXPECT_EQ(kTestDatas[i].expected_encoding, web_contents->GetEncoding());
 
     // Dump the page, the content of dump page should be equal with our expect
     // result file.
     FilePath expected_result_file_name =
         FilePath().AppendASCII(kAutoDetectDir).AppendASCII(kExpectedResultDir).
         AppendASCII(kTestDatas[i].expected_result);
     SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name);
   }
 }