Extended: Add "system" URLRequestContext

chrome/browser/intranet_redirect_detector.cc

Index: chrome/browser/intranet_redirect_detector.cc
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index 8be4d5e2850931ae81efee01be074685795e1b6a..643b29d758855cd8f5ea7670fcb356511fdec29c 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/load_flags.h"
@@ -26,7 +27,8 @@ IntranetRedirectDetector::IntranetRedirectDetector()
           prefs::kLastKnownIntranetRedirectOrigin)),
       ALLOW_THIS_IN_INITIALIZER_LIST(fetcher_factory_(this)),
       in_sleep_(true),
-      request_context_available_(Profile::GetDefaultRequestContext() != NULL) {
+      request_context_available_(
+          g_browser_process->system_request_context() != NULL) {

[willchan no longer on Chromium, 2011/02/21 23:05:49]

Do we know whether or not this works? I believe there's the
Profile::GetDefaultRequestContext() check because this code can be invoked
before the default Profile exists. Is it possible that this code is invoked
before the BrowserProcess is instantiated? If so, g_browser_process might be
NULL. Have you investigated how this works?

You definitely don't need the NULL check, and you won't need the
DEFAULT_REQUEST_CONTEXT_AVAILABLE notification anymore, since you're switching
to the system request context instead of the "default" request context.

[battre, 2011/03/08 17:38:58]

The IntranetRedirectDetector is instantiated by the BrowserProcessImp.
Therefore, it is guaranteed that g_browser_process is non-null.

I have stripped everything related to waiting for the default request context.

Done.

   registrar_.Add(this, NotificationType::DEFAULT_REQUEST_CONTEXT_AVAILABLE,
                  NotificationService::AllSources());
 
@@ -98,7 +100,7 @@ void IntranetRedirectDetector::StartFetchesIfPossible() {
     // We don't want these fetches to affect existing state in the profile.
     fetcher->set_load_flags(net::LOAD_DISABLE_CACHE |
                             net::LOAD_DO_NOT_SAVE_COOKIES);
-    fetcher->set_request_context(Profile::GetDefaultRequestContext());
+    fetcher->set_request_context(g_browser_process->system_request_context());
     fetcher->Start();
     fetchers_.insert(fetcher);
   }