Move url_request_mock_http_job to net/test/url_request/

net/test/url_request/url_request_mock_http_job.h

 // 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.
 //
-// A net::URLRequestJob class that pulls the content and http headers from disk.
+// A net::URLRequestJob class that pulls the net and http headers from disk.
 
-#ifndef CONTENT_TEST_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
-#define CONTENT_TEST_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
+#ifndef NET_TEST_URL_REQUEST_URL_REQUEST_MOCK_HTTP_JOB_H_
+#define NET_TEST_URL_REQUEST_URL_REQUEST_MOCK_HTTP_JOB_H_
 
 #include <string>
 
 #include "net/url_request/url_request_file_job.h"

[mmenke, 2014/09/04 18:05:12]

This was a bug from before, but should base/memory/scoped_ptr.h and url/gurl.h

[xunjieli, 2014/09/04 19:24:15]

Done. Sorry I didn't see this.

 
 namespace base {
 class FilePath;

[mmenke, 2014/09/04 18:05:12]

Need to forward declare SequencedWorkerPool

[xunjieli, 2014/09/04 19:24:15]

Done.

 }
 
 namespace net {
 class URLRequestInterceptor;
 }
 
-namespace content {
+namespace net {
 
 class URLRequestMockHTTPJob : public net::URLRequestFileJob {

[mmenke, 2014/09/04 18:05:12]

"net::" no longer needed in this file.

[xunjieli, 2014/09/04 18:44:25]

Done.

  public:
-  URLRequestMockHTTPJob(net::URLRequest* request,
-                        net::NetworkDelegate* network_delegate,
-                        const base::FilePath& file_path);
+  URLRequestMockHTTPJob(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate,
+      const base::FilePath& file_path,
+      base::SequencedWorkerPool* worker_pool);
 
   virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
   virtual int GetResponseCode() const OVERRIDE;
   virtual bool GetCharset(std::string* charset) OVERRIDE;
   virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
   virtual bool IsRedirectResponse(GURL* location,
                                   int* http_status_code) OVERRIDE;
 
   // Adds the testing URLs to the net::URLRequestFilter.
-  static void AddUrlHandler(const base::FilePath& base_path);
+  static void AddUrlHandler(
+      const base::FilePath& base_path,
+      base::SequencedWorkerPool* worker_pool);

[mmenke, 2014/09/04 18:05:12]

These should probably actually be:

const scoped_refptr<base::SequencedWorkerPool>& worker_pool (And move the refptr
all the way down into the interceptor)

[xunjieli, 2014/09/04 18:44:25]

Done.

 
   // Respond to all HTTP requests of |hostname| with contents of the file
   // located at |file_path|.
-  static void AddHostnameToFileHandler(const std::string& hostname,
-                                       const base::FilePath& file);
+  static void AddHostnameToFileHandler(
+      const std::string& hostname,
+      const base::FilePath& file,
+      base::SequencedWorkerPool* worker_pool);
 
   // Given the path to a file relative to the path passed to AddUrlHandler(),
   // construct a mock URL.
   static GURL GetMockUrl(const base::FilePath& path);
 
   // Given the path to a file relative to the path passed to AddUrlHandler(),
   // construct a mock URL for view source.
   static GURL GetMockViewSourceUrl(const base::FilePath& path);
 
   // Returns a net::URLRequestJobFactory::ProtocolHandler that serves
   // URLRequestMockHTTPJob's responding like an HTTP server. |base_path| is the
   // file path leading to the root of the directory to use as the root of the
   // HTTP server.
   static scoped_ptr<net::URLRequestInterceptor>
-  CreateInterceptor(const base::FilePath& base_path);
+  CreateInterceptor(
+      const base::FilePath& base_path,
+      base::SequencedWorkerPool* worker_pool);
 
   // Returns a net::URLRequestJobFactory::ProtocolHandler that serves
   // URLRequestMockHTTPJob's responding like an HTTP server. It responds to all
   // requests with the contents of |file|.
   static scoped_ptr<net::URLRequestInterceptor>
-  CreateInterceptorForSingleFile(const base::FilePath& file);
+  CreateInterceptorForSingleFile(const base::FilePath& file,
+                                 base::SequencedWorkerPool* worker_pool);
 
  protected:
   virtual ~URLRequestMockHTTPJob();
 
  private:
   void GetResponseInfoConst(net::HttpResponseInfo* info) const;

[mmenke, 2014/09/04 18:05:12]

Another bug from before:  There should be a
"DISALLOW_COPY_AND_ASSIGN(URLRequestMockHTTPJob);" here (And include
"base/macros.h" for that)

[xunjieli, 2014/09/04 18:44:25]

Done. Thanks!

 };
 
-}  // namespace content
+}  // namespace net
 
-#endif  // CONTENT_TEST_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
+#endif  // NET_TEST_URL_REQUEST_URL_REQUEST_MOCK_HTTP_JOB_H_