Add a command line switch "--disable-background-networking", to be used in...

chrome/browser/google/google_url_tracker.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
+#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/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/url_fetcher_protect.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 const char GoogleURLTracker::kDefaultGoogleHomepage[] =
     "http://www.google.com/";
 const char GoogleURLTracker::kSearchDomainCheckURL[] =
@@ skipping 151 matching lines @@
   // 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_)
     return;
 
+  if (CommandLine::ForCurrentProcess()->HasSwitch(

[Peter Kasting, 2010/09/08 19:38:45]

Nit: I'd put this at the end of the above conditional list, or else at the top
of the function.

+      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
   // 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());
@@ skipping 148 matching lines @@
     TabContents* tab_contents) {
   if (!need_to_prompt_)
     return;
   DCHECK(!fetched_google_url_.is_empty());
   DCHECK(infobar_factory_.get());
 
   infobar_ = infobar_factory_->CreateInfoBar(tab_contents,
                                              this,
                                              fetched_google_url_);
 }