Move url_request_mock_http_job to net/test/url_request/

content/browser/plugin_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/command_line.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/common/shell_switches.h"
-#include "content/test/net/url_request_mock_http_job.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/url_request/url_request.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #endif
 
 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861
 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
 #define MAYBE(x) DISABLED_##x
 #else
 #define MAYBE(x) x
 #endif
 
 using base::ASCIIToUTF16;
 
 namespace content {
 namespace {
 
 void SetUrlRequestMock(const base::FilePath& path) {
-  URLRequestMockHTTPJob::AddUrlHandler(path);
+  net::URLRequestMockHTTPJob::AddUrlHandler(
+      path, content::BrowserThread::GetBlockingPool());
 }
 
 }
 
 class PluginTest : public ContentBrowserTest {
  protected:
   PluginTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // Some NPAPI tests schedule garbage collection to force object tear-down.
@@ skipping 126 matching lines @@
 #endif
 
 // Flaky, http://crbug.com/302274.
 #if defined(OS_MACOSX)
 #define MAYBE_GetURLRequest404Response DISABLED_GetURLRequest404Response
 #else
 #define MAYBE_GetURLRequest404Response MAYBE(GetURLRequest404Response)
 #endif
 
 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE_GetURLRequest404Response) {
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(
-      base::FilePath().AppendASCII("npapi").
-                       AppendASCII("plugin_url_request_404.html")));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(
+      base::FilePath().AppendASCII("npapi").AppendASCII(
+          "plugin_url_request_404.html")));
   LoadAndWait(url);
 }
 
 // Tests if a plugin executing a self deleting script using Invoke with
 // a modal dialog showing works without crashing or hanging
 // Disabled, flakily exceeds timeout, http://crbug.com/46257.
 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInvokeAlert)) {
   // Navigate asynchronously because if we waitd until it completes, there's a
   // race condition where the alert can come up before we start watching for it.
   shell()->LoadURL(GetURL("self_delete_plugin_invoke_alert.html"));
@@ skipping 168 matching lines @@
 
 // These used to run on Windows: http://crbug.com/396373
 #if defined(OS_MACOSX)
 // Test a browser hang due to special case of multiple
 // plugin instances indulged in sync calls across renderer.
 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(MultipleInstancesSyncCalls)) {
   LoadAndWait(GetURL("multiple_instances_sync_calls.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetURLRequestFailWrite)) {
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(
-      base::FilePath().AppendASCII("npapi").
-                       AppendASCII("plugin_url_request_fail_write.html")));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(
+      base::FilePath().AppendASCII("npapi").AppendASCII(
+          "plugin_url_request_fail_write.html")));
   LoadAndWait(url);
 }
 #endif
 
 #if defined(OS_WIN)
 // Flaky on Windows x86.  http://crbug.com/388245
 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_EnsureScriptingWorksInDestroy) {
   LoadAndWait(GetURL("ensure_scripting_works_in_destroy.html"));
 }
 
 // This test uses a Windows Event to signal to the plugin that it should crash
 // on NP_Initialize.
 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NoHangIfInitCrashes)) {
   HANDLE crash_event = CreateEvent(NULL, TRUE, FALSE, L"TestPluginCrashOnInit");
   SetEvent(crash_event);
   LoadAndWait(GetURL("no_hang_if_init_crashes.html"));
   CloseHandle(crash_event);
 }
 #endif
 
 // If this flakes on Mac, use http://crbug.com/111508
 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PluginReferrerTest)) {
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(
-      base::FilePath().AppendASCII("npapi").
-                       AppendASCII("plugin_url_request_referrer_test.html")));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(
+      base::FilePath().AppendASCII("npapi").AppendASCII(
+          "plugin_url_request_referrer_test.html")));
   LoadAndWait(url);
 }
 
 #if defined(OS_MACOSX)
 // Test is flaky, see http://crbug.com/134515.
 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_PluginConvertPointTest) {
   gfx::Rect bounds(50, 50, 400, 400);
   SetWindowBounds(shell()->window(), bounds);
 
   NavigateToURL(shell(), GetURL("convert_point.html"));
@@ skipping 139 matching lines @@
   ResourceDispatcherHostDelegate* old_delegate =
       ResourceDispatcherHostImpl::Get()->delegate();
   ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate);
   LoadAndWait(url);
   test_delegate.WaitForPluginRequest();
   ASSERT_TRUE(test_delegate.found_cookie());
   ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate);
 }
 
 }  // namespace content