Extended: Add "system" URLRequestContext

chrome/browser/google/google_url_tracker.cc

 // Copyright (c) 2011 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/google/google_url_tracker.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ skipping 63 matching lines @@
 GoogleURLTracker::GoogleURLTracker()
     : infobar_creator_(&CreateInfobar),
       google_url_(g_browser_process->local_state()->GetString(
           prefs::kLastKnownGoogleURL)),
       ALLOW_THIS_IN_INITIALIZER_LIST(runnable_method_factory_(this)),
       fetcher_id_(0),
       queue_wakeup_task_(true),
       in_startup_sleep_(true),
       already_fetched_(false),
       need_to_fetch_(false),
-      request_context_available_(!!Profile::GetDefaultRequestContext()),
       need_to_prompt_(false),
       controller_(NULL),
       infobar_(NULL) {
-  registrar_.Add(this, NotificationType::DEFAULT_REQUEST_CONTEXT_AVAILABLE,
-                 NotificationService::AllSources());
-
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
 
   MessageLoop::current()->PostTask(FROM_HERE,
                                    runnable_method_factory_.NewRunnableMethod(
                                    &GoogleURLTracker::QueueWakeupTask));
 }
 
 GoogleURLTracker::~GoogleURLTracker() {
   runnable_method_factory_.RevokeAll();
   net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
@@ skipping 56 matching lines @@
   StartFetchIfDesirable();
 }
 
 void GoogleURLTracker::StartFetchIfDesirable() {
   // Bail if a fetch isn't appropriate right now.  This function will be called
   // again each time one of the preconditions changes, so we'll fetch
   // immediately once all of them are met.
   //
   // See comments in header on the class, on RequestServerCheck(), and on the
   // various members here for more detail on exactly what the conditions are.
-  if (in_startup_sleep_ || already_fetched_ || !need_to_fetch_ ||
-      !request_context_available_)
+  if (in_startup_sleep_ || already_fetched_ || !need_to_fetch_)
     return;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableBackgroundNetworking))
     return;
 
   already_fetched_ = true;
   fetcher_.reset(URLFetcher::Create(fetcher_id_, GURL(kSearchDomainCheckURL),
                                     URLFetcher::GET, this));
   ++fetcher_id_;
-  // We don't want this fetch to affect existing state in the profile.  For
+  // We don't want this fetch to affect existing state in local_state.  For
   // example, if a user has no Google cookies, this automatic check should not
   // cause one to be set, lest we alarm the user.
   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());
 
   // Configure to max_retries at most kMaxRetries times for 5xx errors.
   static const int kMaxRetries = 5;
   fetcher_->set_max_retries(kMaxRetries);
 
   fetcher_->Start();
 }
 
 void GoogleURLTracker::OnURLFetchComplete(const URLFetcher* source,
                                           const GURL& url,
@@ skipping 79 matching lines @@
   GURL new_search_url(search_url_.ReplaceComponents(replacements));
   if (new_search_url.is_valid())
     controller_->tab_contents()->OpenURL(new_search_url, GURL(), CURRENT_TAB,
                                          PageTransition::GENERATED);
 }
 
 void GoogleURLTracker::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   switch (type.value) {
-    case NotificationType::DEFAULT_REQUEST_CONTEXT_AVAILABLE:
-      registrar_.Remove(this,
-                        NotificationType::DEFAULT_REQUEST_CONTEXT_AVAILABLE,
-                        NotificationService::AllSources());
-      request_context_available_ = true;
-      StartFetchIfDesirable();
-      break;
-
     case NotificationType::NAV_ENTRY_PENDING: {
       NavigationController* controller =
           Source<NavigationController>(source).ptr();
       OnNavigationPending(source, controller->pending_entry()->url());
       break;
     }
 
     case NotificationType::NAV_ENTRY_COMMITTED:
     case NotificationType::TAB_CLOSED:
       OnNavigationCommittedOrTabClosed(
@@ skipping 48 matching lines @@
 }
 
 void GoogleURLTracker::ShowGoogleURLInfoBarIfNecessary(
     TabContents* tab_contents) {
   if (!need_to_prompt_)
     return;
   DCHECK(!fetched_google_url_.is_empty());
 
   infobar_ = (*infobar_creator_)(tab_contents, this, fetched_google_url_);
 }