[New Tab Page] Change the mechanism to intercept online NTP errors

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 "net/test/url_request/url_request_mock_http_job.h"
 
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 81 matching lines @@
   }
 
   std::string raw_headers;
   base::ReadFileToString(header_file, &raw_headers);
   return raw_headers;
 }
 
 }  // namespace
 
 // static
-void URLRequestMockHTTPJob::AddUrlHandler(
+void URLRequestMockHTTPJob::AddUrlHandlers(
     const base::FilePath& base_path,
     const scoped_refptr<base::SequencedWorkerPool>& worker_pool) {
-  // Add kMockHostname to net::URLRequestFilter.
+  // Add kMockHostname to net::URLRequestFilter, for both HTTP and HTTPS.
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
   filter->AddHostnameInterceptor(
       "http", kMockHostname, CreateInterceptor(base_path, worker_pool));
+  filter->AddHostnameInterceptor("https", kMockHostname,
+                                 CreateInterceptor(base_path, worker_pool));
 }
 
 // static
 void URLRequestMockHTTPJob::AddHostnameToFileHandler(
     const std::string& hostname,
     const base::FilePath& file,
     const scoped_refptr<base::SequencedWorkerPool>& worker_pool) {
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
   filter->AddHostnameInterceptor(
       "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);
+  return GetMockUrlForScheme(path, "http");
 }
 
 // static
+GURL URLRequestMockHTTPJob::GetMockHttpsUrl(const base::FilePath& path) {
+  return GetMockUrlForScheme(path, "https");
+}
+
+// static
 GURL URLRequestMockHTTPJob::GetMockUrlWithFailure(const base::FilePath& path,
                                                   FailurePhase phase,
                                                   int net_error) {
   COMPILE_ASSERT(arraysize(kFailurePhase) == MAX_FAILURE_PHASE,
                  kFailurePhase_must_match_FailurePhase_enum);
   DCHECK_GE(phase, START);
   DCHECK_LE(phase, READ_SYNC);
   std::string url(GetMockUrl(path).spec());
   url.append("?");
   url.append(kFailurePhase[phase]);
@@ skipping 25 matching lines @@
     const base::FilePath& file_path,
     const scoped_refptr<base::TaskRunner>& task_runner)
     : net::URLRequestFileJob(request, network_delegate, file_path, task_runner),
       task_runner_(task_runner),
       weak_ptr_factory_(this) {
 }
 
 URLRequestMockHTTPJob::~URLRequestMockHTTPJob() {
 }
 
+// static
+GURL URLRequestMockHTTPJob::GetMockUrlForScheme(const base::FilePath& path,

[mmenke, 2015/01/15 22:35:30]

nit:  Instead of making this a static member of URLRequestMockHTTPJob, can just
move this into the anonymous namespace up top.

At least in net/, this is the preferred pattern, to keep stuff out of the
headers.

[Mathieu, 2015/01/22 19:21:59]

Done.

+                                                const std::string& scheme) {
+  std::string url = scheme + "://";
+  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);
+}
+
 // 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.
@@ skipping 89 matching lines @@
   return net::URLRequestJob::GetResponseCode();
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers.get() && info.headers->GetCharset(charset);
 }
 
 }  // namespace net