[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 58 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 878 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/22 20:53:50]

Is there a reason to prefer this here over
ProfileImplIOData::Handle::CreateMainRequestContextGetter?

If there's a reason, I'm fine with it here, but most of the URLRequestContext
setup happens in Profile.*IOData, so it's easier to keep track of all the stuff
that is attached to the poor beleaguered request context if we try and keep most
of it there...Of course, my suggestion only overs main profiles, but since we
don't want it for incognito, anyways, not sure that's an issue.

[Mathieu, 2015/01/22 21:44:22]

I'll let kmadhusu comment on whether she considered it.

So there seems to be a good candidate place here:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/pro...

This is pretty deep down, but if you think it's a better place let me know. 

[mmenke, 2015/01/22 21:52:29]

That's actually called on the IO thread, so wouldn't work.  I believe
ProfileIOData::InitializeOnUIThread is actually the latest place you could put
it (Not sure you can access the interceptor list there, but you can stick it in
params, and then hook it up later down the line on the IO thread).

There is already at least one other interceptor created there.

[kmadhusu, 2015/01/23 00:59:32]

I didn't try to create an interceptor in
ProfileImplIOData::Handle::CreateMainRequestContextGetter. There should not be
any problem to move this code there because line 983 eventually calls that
function.

But I did try to create an interceptor instance in
ProfileImplIOData::InitializeInternal() and it failed because of thread
violation. Feel free to move this code to any better place as long as that code
runs on an UI thread.

   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 1635 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome