Move url_request_mock_http_job to net/test/url_request/

chrome/browser/captive_portal/captive_portal_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 <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 24 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/test/net/url_request_failed_job.h"
-#include "content/test/net/url_request_mock_http_job.h"
 #include "net/base/net_errors.h"
 #include "net/http/transport_security_state.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using captive_portal::CaptivePortalResult;
 using content::BrowserThread;
 using content::URLRequestFailedJob;
-using content::URLRequestMockHTTPJob;
+using net::URLRequestMockHTTPJob;

[Lei Zhang, 2014/09/09 21:37:59]

nit: sort

[xunjieli, 2014/09/09 22:08:58]

Done.

 using content::WebContents;
 
 namespace {
 
 // Path of the fake login page, when using the TestServer.
 const char* const kTestServerLoginPath = "files/captive_portal/login.html";
 
 // Path of a page with an iframe that has a mock SSL timeout, when using the
 // TestServer.
 const char* const kTestServerIframeTimeoutPath =
@@ skipping 350 matching lines @@
 
   if (request->url() == GURL(kMockHttpsUrl) ||
       request->url() == GURL(kMockHttpsUrl2)) {
     if (behind_captive_portal_)
       return new URLRequestTimeoutOnDemandJob(request, network_delegate);
     // Once logged in to the portal, HTTPS requests return the page that was
     // actually requested.
     return new URLRequestMockHTTPJob(
         request,
         network_delegate,
-        root_http.Append(FILE_PATH_LITERAL("title2.html")));
+        root_http.Append(FILE_PATH_LITERAL("title2.html")),
+        content::BrowserThread::GetBlockingPool()

[Lei Zhang, 2014/09/09 21:37:59]

nit: Write this as
BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(

so it fits on 1 line. Ditto below and in some other files.

[xunjieli, 2014/09/09 22:08:58]

Done.Thanks!

+            ->GetTaskRunnerWithShutdownBehavior(
+                base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
   } else if (request->url() == GURL(kMockHttpsQuickTimeoutUrl)) {
     if (behind_captive_portal_)
       return new URLRequestFailedJob(
           request, network_delegate, net::ERR_CONNECTION_TIMED_OUT);
     // Once logged in to the portal, HTTPS requests return the page that was
     // actually requested.
     return new URLRequestMockHTTPJob(
         request,
         network_delegate,
-        root_http.Append(FILE_PATH_LITERAL("title2.html")));
+        root_http.Append(FILE_PATH_LITERAL("title2.html")),
+        content::BrowserThread::GetBlockingPool()
+            ->GetTaskRunnerWithShutdownBehavior(
+                base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
   } else {
     // The URL should be the captive portal test URL.
     EXPECT_TRUE(GURL(kMockCaptivePortalTestUrl) == request->url() ||
                 GURL(kMockCaptivePortal511Url) == request->url());
 
     if (behind_captive_portal_) {
       // Prior to logging in to the portal, the HTTP test URLs are intercepted
       // by the captive portal.
       if (GURL(kMockCaptivePortal511Url) == request->url()) {
         return new URLRequestMockHTTPJob(
             request,
             network_delegate,
-            root_http.Append(FILE_PATH_LITERAL("captive_portal/page511.html")));
+            root_http.Append(FILE_PATH_LITERAL("captive_portal/page511.html")),
+            content::BrowserThread::GetBlockingPool()
+                ->GetTaskRunnerWithShutdownBehavior(
+                    base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
       }
       return new URLRequestMockHTTPJob(
           request,
           network_delegate,
-          root_http.Append(FILE_PATH_LITERAL("captive_portal/login.html")));
+          root_http.Append(FILE_PATH_LITERAL("captive_portal/login.html")),
+          content::BrowserThread::GetBlockingPool()
+              ->GetTaskRunnerWithShutdownBehavior(
+                  base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
     }
 
     // After logging in to the portal, the test URLs return a 204 response.
     return new URLRequestMockHTTPJob(
         request,
         network_delegate,
-        root_http.Append(FILE_PATH_LITERAL("captive_portal/page204.html")));
+        root_http.Append(FILE_PATH_LITERAL("captive_portal/page204.html")),
+        content::BrowserThread::GetBlockingPool()
+            ->GetTaskRunnerWithShutdownBehavior(
+                base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
   }
 }
 
 // Creates a server-side redirect for use with the TestServer.
 std::string CreateServerRedirect(const std::string& dest_url) {
   const char* const kServerRedirectBase = "server-redirect?";
   return kServerRedirectBase + dest_url;
 }
 
 // Returns the total number of loading tabs across all Browsers, for all
@@ skipping 1718 matching lines @@
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&AddHstsHost,
                  make_scoped_refptr(browser()->profile()->GetRequestContext()),
                  http_timeout_url.host()));
 
   SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1);
   Login(browser(), 1, 0);
   FailLoadsAfterLogin(browser(), 1);
 }