Move url_request_mock_http_job to net/test/url_request/

content/browser/download/drag_download_file_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/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/memory/ref_counted.h"
 #include "content/browser/download/download_file_factory.h"
 #include "content/browser/download/download_file_impl.h"
 #include "content/browser/download/download_item_impl.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/download/drag_download_file.h"
 #include "content/browser/download/drag_download_util.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/power_save_blocker.h"
 #include "content/public/common/content_client.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/download_test_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/browser/shell_download_manager_delegate.h"
-#include "content/test/net/url_request_mock_http_job.h"
 #include "content/test/net/url_request_slow_download_job.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using testing::_;
 using testing::InvokeWithoutArgs;
 
 namespace content {
 
 class MockDownloadFileObserver : public ui::DownloadFileObserver {
@@ skipping 31 matching lines @@
         static_cast<ShellDownloadManagerDelegate*>(
             shell()->web_contents()->GetBrowserContext()
             ->GetDownloadManagerDelegate());
     delegate->SetDownloadBehaviorForTesting(downloads_directory());
   }
 
   void SetUpServer() {
     base::FilePath mock_base(GetTestFilePath("download", ""));
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        base::Bind(&URLRequestMockHTTPJob::AddUrlHandler, mock_base));
+        base::Bind(&net::URLRequestMockHTTPJob::AddUrlHandler, mock_base,
+                   make_scoped_refptr(
+                       content::BrowserThread::GetBlockingPool())));
   }
 
   const base::FilePath& downloads_directory() const {
     return downloads_directory_.path();
   }
 
  private:
   base::ScopedTempDir downloads_directory_;
 
   DISALLOW_COPY_AND_ASSIGN(DragDownloadFileTest);
 };
 
 IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_NetError) {
   base::FilePath name(downloads_directory().AppendASCII(
       "DragDownloadFileTest_NetError.txt"));
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(base::FilePath(FILE_PATH_LITERAL(
-      "download-test.lib"))));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(
+      base::FilePath(FILE_PATH_LITERAL("download-test.lib"))));
   Referrer referrer;
   std::string referrer_encoding;
   scoped_refptr<DragDownloadFile> file(
       new DragDownloadFile(name, base::File(), url, referrer,
                            referrer_encoding, shell()->web_contents()));
   scoped_refptr<MockDownloadFileObserver> observer(
       new MockDownloadFileObserver());
   EXPECT_CALL(*observer.get(), OnDownloadAborted())
       .WillOnce(InvokeWithoutArgs(this, &DragDownloadFileTest::Succeed));
   ON_CALL(*observer.get(), OnDownloadCompleted(_))
       .WillByDefault(InvokeWithoutArgs(this, &DragDownloadFileTest::FailFast));
   file->Start(observer.get());
   RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_Complete) {
   base::FilePath name(downloads_directory().AppendASCII(
         "DragDownloadFileTest_Complete.txt"));
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(base::FilePath(FILE_PATH_LITERAL(
-      "download-test.lib"))));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(
+      base::FilePath(FILE_PATH_LITERAL("download-test.lib"))));
   Referrer referrer;
   std::string referrer_encoding;
   SetUpServer();
   scoped_refptr<DragDownloadFile> file(new DragDownloadFile(
       name, base::File(), url, referrer,
       referrer_encoding, shell()->web_contents()));
   scoped_refptr<MockDownloadFileObserver> observer(
       new MockDownloadFileObserver());
   EXPECT_CALL(*observer.get(), OnDownloadCompleted(_))
       .WillOnce(InvokeWithoutArgs(this, &DragDownloadFileTest::Succeed));
   ON_CALL(*observer.get(), OnDownloadAborted())
       .WillByDefault(InvokeWithoutArgs(this, &DragDownloadFileTest::FailFast));
   file->Start(observer.get());
   RunMessageLoop();
 }
 
 // TODO(benjhayden): Test Stop().
 
 }  // namespace content