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

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 59 matching lines @@
 #include "chrome/browser/speech/tts_message_filter.h"
 #include "chrome/browser/ssl/ssl_add_certificate.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
 #include "chrome/browser/ssl/ssl_error_handler.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "chrome/browser/ui/search/new_tab_page_interceptor_service.h"
+#include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pepper_permission_util.h"
 #include "chrome/common/pref_names.h"
@@ skipping 884 matching lines @@
   hosts->push_back(chrome::kChromeUIThumbnailHost2);
   hosts->push_back(chrome::kChromeUIThumbnailListHost);
 }
 
 net::URLRequestContextGetter*
 ChromeContentBrowserClient::CreateRequestContext(
     content::BrowserContext* browser_context,
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
+  NewTabPageInterceptorService* service =
+      NewTabPageInterceptorServiceFactory::GetForProfile(profile);
+  if (service)
+    request_interceptors.push_back(service->CreateInterceptor().release());

[mmenke, 2015/01/16 22:04:16]

Should we really make one of these for incognito?

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

Are you saying we should? Currently we are not creating the interceptor in
incognito. It's not the same NTP.

[kmadhusu, 2015/01/22 20:06:30]

Incognito mode doesn't use an online ntp. We don't need to intercept those NTP
requests.

[mmenke, 2015/01/22 20:53:50]

Right...I missed the face that in
NewTabPageInterceptorServiceFactory::GetForProfile, we weren't creating a
service for incognito.  Had been thinking that were were making one for
incognito, which seemed like a bad idea.

   return profile->CreateRequestContext(protocol_handlers,
                                        request_interceptors.Pass());
 }
 
 net::URLRequestContextGetter*
 ChromeContentBrowserClient::CreateRequestContextForStoragePartition(
     content::BrowserContext* browser_context,
     const base::FilePath& partition_path,
     bool in_memory,
     content::ProtocolHandlerMap* protocol_handlers,
@@ skipping 1634 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome