Move url_request_mock_http_job to net/test/url_request/

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/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_navigation_observer.h"
-#include "content/test/net/url_request_mock_http_job.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
 
 namespace {
 
 struct EncodingTestData {
   const char* file_name;
   const char* encoding_name;
 };
 
 const EncodingTestData kEncodingTestDatas[] = {
   { "Big5.html", "Big5" },
@@ skipping 120 matching lines @@
 // also necessary.
 IN_PROC_BROWSER_TEST_P(BrowserEncodingTest, TestEncodingAliasMapping) {
   const char* const kAliasTestDir = "alias_mapping";
 
   base::FilePath test_dir_path = base::FilePath(kTestDir).AppendASCII(
       kAliasTestDir);
   base::FilePath test_file_path(test_dir_path);
   test_file_path = test_file_path.AppendASCII(
       GetParam().file_name);
 
-  GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path);
+  GURL url = net::URLRequestMockHTTPJob::GetMockUrl(test_file_path);
   ui_test_utils::NavigateToURL(browser(), url);
   EXPECT_EQ(GetParam().encoding_name,
             browser()->tab_strip_model()->GetActiveWebContents()->
                 GetEncoding());
 }
 
 INSTANTIATE_TEST_CASE_P(EncodingAliases,
                         BrowserEncodingTest,
                         testing::ValuesIn(kEncodingTestDatas));
 
 // 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";
 
   base::FilePath test_dir_path =
       base::FilePath(kTestDir).AppendASCII(kOverrideTestDir);
   test_dir_path = test_dir_path.AppendASCII(kTestFileName);
-  GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
+  GURL url = net::URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   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(web_contents);
   web_contents->SetOverrideEncoding(selected_encoding);
@@ skipping 97 matching lines @@
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestDatas); ++i) {
     // Disable auto detect if it is on.
     browser()->profile()->GetPrefs()->SetBoolean(
         prefs::kWebKitUsesUniversalDetector, false);
 
     base::FilePath test_file_path(test_dir_path);
     test_file_path = test_file_path.AppendASCII(kTestDatas[i].test_file_name);
-    GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path);
+    GURL url = net::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(web_contents);
     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.
     base::FilePath expected_result_file_name =
         base::FilePath().AppendASCII(kAutoDetectDir).
         AppendASCII(kExpectedResultDir).
         AppendASCII(kTestDatas[i].expected_result);
     SaveAndCompare(kTestDatas[i].test_file_name, expected_result_file_name);
   }
 }