Move url_request_mock_http_job to net/test/url_request/

chrome/browser/plugins/npapi_infobar_browsertest.cc

 // Copyright 2014 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/command_line.h"
 #include "base/files/file_path.h"
+#include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
 #include "base/path_service.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.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/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
-#include "content/test/net/url_request_mock_http_job.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
-using content::URLRequestMockHTTPJob;
-
+using net::URLRequestMockHTTPJob;
 
 namespace {
 
 // Tests that the NPAPI unauthorized plugin infobar is:
 // (1) Shown when the Finch trial is set to "Enabled"
 // (2) Not shown when the Finch trial is set to "Disabled"
 // TODO(cthomp): Remove/simplify when Finch trial is completed crbug.com/381944
 class UnauthorizedPluginInfoBarBrowserTest : public InProcessBrowserTest {
  protected:
   UnauthorizedPluginInfoBarBrowserTest() {}
 
   // Makes URLRequestMockHTTPJobs serve data from content::DIR_TEST_DATA
   // instead of chrome::DIR_TEST_DATA.
   void ServeContentTestData() {
     base::FilePath root_http;
     PathService::Get(content::DIR_TEST_DATA, &root_http);
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
     BrowserThread::PostTaskAndReply(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(URLRequestMockHTTPJob::AddUrlHandler, root_http),
+        BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(URLRequestMockHTTPJob::AddUrlHandler,
+                   root_http,
+                   make_scoped_refptr(BrowserThread::GetBlockingPool())),
         runner->QuitClosure());
     runner->Run();
   }
 
  public:
   // Verifies that the test page exists (only present with src-internal)
   bool TestPageExists() {
     return base::PathExists(ui_test_utils::GetTestFilePath(
         base::FilePath(FILE_PATH_LITERAL("plugin")),
         base::FilePath(FILE_PATH_LITERAL("quicktime.html"))));
@@ skipping 43 matching lines @@
     return;
   }
   base::FieldTrialList::CreateTrialsFromString(
       "UnauthorizedPluginInfoBar/Disabled/",
       base::FieldTrialList::ACTIVATE_TRIALS,
       std::set<std::string>());
   InfoBarCountTest(0u, browser());
 }
 
 }  // namespace