Move url_request_mock_http_job to net/test/url_request/

net/test/url_request/url_request_mock_http_job.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 "content/test/net/url_request_mock_http_job.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
 
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_restrictions.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/common/url_constants.h"
 #include "net/base/filename_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_interceptor.h"
 
 const char kMockHostname[] = "mock.http";
 const base::FilePath::CharType kMockHeaderFileSuffix[] =
     FILE_PATH_LITERAL(".mock-http-headers");
 
-namespace content {
+namespace net {
 
 namespace {
 
 class MockJobInterceptor : public net::URLRequestInterceptor {
  public:
   // When |map_all_requests_to_base_path| is true, all request should return the
   // contents of the file at |base_path|. When |map_all_requests_to_base_path|
   // is false, |base_path| is the file path leading to the root of the directory
   // to use as the root of the HTTP server.
-  MockJobInterceptor(const base::FilePath& base_path,
-                     bool map_all_requests_to_base_path)
+  MockJobInterceptor(
+      const base::FilePath& base_path,
+      bool map_all_requests_to_base_path,
+      const scoped_refptr<base::SequencedWorkerPool>& worker_pool)
       : base_path_(base_path),
-        map_all_requests_to_base_path_(map_all_requests_to_base_path) {}
+        map_all_requests_to_base_path_(map_all_requests_to_base_path),
+        worker_pool_(worker_pool) {}
   virtual ~MockJobInterceptor() {}
 
   // net::URLRequestJobFactory::ProtocolHandler implementation
   virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE {
     return new URLRequestMockHTTPJob(request, network_delegate,
-        map_all_requests_to_base_path_ ? base_path_ : GetOnDiskPath(request));
+        map_all_requests_to_base_path_ ? base_path_ : GetOnDiskPath(request),
+        worker_pool_);
   }
 
  private:
   base::FilePath GetOnDiskPath(net::URLRequest* request) const {
     // Conceptually we just want to "return base_path_ + request->url().path()".
     // But path in the request URL is in URL space (i.e. %-encoded spaces).
     // So first we convert base FilePath to a URL, then append the URL
     // path to that, and convert the final URL back to a FilePath.
     GURL file_url(net::FilePathToFileURL(base_path_));
     std::string url = file_url.spec() + request->url().path();
     base::FilePath file_path;
     net::FileURLToFilePath(GURL(url), &file_path);
     return file_path;
   }
 
   const base::FilePath base_path_;
   const bool map_all_requests_to_base_path_;
+  const scoped_refptr<base::SequencedWorkerPool> worker_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(MockJobInterceptor);
 };
 
 }  // namespace
 
 // static
-void URLRequestMockHTTPJob::AddUrlHandler(const base::FilePath& base_path) {
+void URLRequestMockHTTPJob::AddUrlHandler(
+    const base::FilePath& base_path,
+    const scoped_refptr<base::SequencedWorkerPool>& worker_pool) {
   // Add kMockHostname to net::URLRequestFilter.
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
   filter->AddHostnameInterceptor(
-      "http", kMockHostname, CreateInterceptor(base_path));
+      "http", kMockHostname, CreateInterceptor(base_path, worker_pool));
 }
 
 // static
 void URLRequestMockHTTPJob::AddHostnameToFileHandler(
     const std::string& hostname,
-    const base::FilePath& file) {
+    const base::FilePath& file,
+    const scoped_refptr<base::SequencedWorkerPool>& worker_pool) {
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
   filter->AddHostnameInterceptor(
-      "http", hostname, CreateInterceptorForSingleFile(file));
+      "http", hostname,
+      CreateInterceptorForSingleFile(file, worker_pool));
 }
 
 // static
 GURL URLRequestMockHTTPJob::GetMockUrl(const base::FilePath& path) {
   std::string url = "http://";
   url.append(kMockHostname);
   url.append("/");
   std::string path_str = path.MaybeAsASCII();
   DCHECK(!path_str.empty());  // We only expect ASCII paths in tests.
   url.append(path_str);
   return GURL(url);
 }
 
 // static
-GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const base::FilePath& path) {
-  std::string url = kViewSourceScheme;
-  url.append(":");
-  url.append(GetMockUrl(path).spec());
-  return GURL(url);
-}
-
-// static
 scoped_ptr<net::URLRequestInterceptor>
-URLRequestMockHTTPJob::CreateInterceptor(const base::FilePath& base_path) {
+URLRequestMockHTTPJob::CreateInterceptor(
+    const base::FilePath& base_path,
+    const scoped_refptr<base::SequencedWorkerPool>& worker_pool) {
   return scoped_ptr<net::URLRequestInterceptor>(
-      new MockJobInterceptor(base_path, false));
+      new MockJobInterceptor(base_path, false, worker_pool));
 }
 
 // static
 scoped_ptr<net::URLRequestInterceptor>
 URLRequestMockHTTPJob::CreateInterceptorForSingleFile(
-    const base::FilePath& file) {
+    const base::FilePath& file,
+    const scoped_refptr<base::SequencedWorkerPool>& worker_pool) {
   return scoped_ptr<net::URLRequestInterceptor>(
-      new MockJobInterceptor(file, true));
+      new MockJobInterceptor(file, true, worker_pool));
 }
 
 URLRequestMockHTTPJob::URLRequestMockHTTPJob(
     net::URLRequest* request, net::NetworkDelegate* network_delegate,
-    const base::FilePath& file_path)
+    const base::FilePath& file_path,
+    const scoped_refptr<base::SequencedWorkerPool>& worker_pool)
     : net::URLRequestFileJob(
           request, network_delegate, file_path,
-          content::BrowserThread::GetBlockingPool()->
-              GetTaskRunnerWithShutdownBehavior(
-                  base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)) {}
+          worker_pool->GetTaskRunnerWithShutdownBehavior(
+              base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)) {}
 
 URLRequestMockHTTPJob::~URLRequestMockHTTPJob() { }
 
 // Public virtual version.
 void URLRequestMockHTTPJob::GetResponseInfo(net::HttpResponseInfo* info) {
   // Forward to private const version.
   GetResponseInfoConst(info);
 }
 
 bool URLRequestMockHTTPJob::IsRedirectResponse(GURL* location,
                                                int* http_status_code) {
   // Override the net::URLRequestFileJob implementation to invoke the default
   // one based on HttpResponseInfo.
   return net::URLRequestJob::IsRedirectResponse(location, http_status_code);
 }
 
 // Private const version.
 void URLRequestMockHTTPJob::GetResponseInfoConst(
     net::HttpResponseInfo* info) const {
   // We have to load our headers from disk, but we only use this class
   // from tests, so allow these IO operations to happen on any thread.
-  base::ThreadRestrictions::ScopedAllowIO allow_io;
+  base::ThreadRestrictions::SetIOAllowed(true);

[mmenke, 2014/09/05 15:54:09]

This has me rather concerned - this basically allows anything that wants to do
file IO on the (Misleadingly named) IO thread, so we lose test coverage of the
fact we should, in general, never do file IO on that thread, in production code.

So how do we fix it?  We could just disallow IO again, but that seems very
regression prone, and is basically getting around whatever warning you're
getting about ScopedAllowIO by just inlining it, which isn't really the
intention of the warning.

So we already have a task runner that we can do file IO on that we're passing to
the base class.  Let's just reuse it.  You can add a Start() function, and have
it call PostTaskAndReplyWithResult on the task runner.  The function should just
take in a FilePath, and return the header string or the HttpResponseHeaders
(Since the latter is refcounted, a string may be a little simpler, though less
efficient).

The function that gets the result back should then set a class variable that
contains the headers, and call URLRequestFileJob::Start, and then this function
should just return those headers, and we're done.

Sorry to go so far afield of the original intention of this CL.  The old code
was just grandfathered in.

[xunjieli, 2014/09/05 19:26:15]

Done. If it's a problem, we should definitely fix it. Thanks for the detailed
how-tos!

On 2014/09/05 15:54:09, mmenke wrote:

 
   base::FilePath header_file =
       base::FilePath(file_path_.value() + kMockHeaderFileSuffix);
   std::string raw_headers;
   if (!base::PathExists(header_file)) {
     // If there is no mock-http-headers file, fake a 200 OK.
     raw_headers = "HTTP/1.0 200 OK\n";
   } else {
     if (!base::ReadFileToString(header_file, &raw_headers))
       return;
@@ skipping 20 matching lines @@
     return info.headers->response_code();
   return net::URLRequestJob::GetResponseCode();
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers.get() && info.headers->GetCharset(charset);
 }
 
-}  // namespace content
+}  // namespace net