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

chrome/browser/intranet_redirect_detector.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/intranet_redirect_detector.h"
 
+#include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/stl_util-inl.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/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request_status.h"
 
 const size_t IntranetRedirectDetector::kNumCharsInHostnames = 10;
 
 IntranetRedirectDetector::IntranetRedirectDetector()
@@ skipping 48 matching lines @@
   StartFetchesIfPossible();
 }
 
 void IntranetRedirectDetector::StartFetchesIfPossible() {
   // 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.
   if (in_sleep_ || !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;
+
   DCHECK(fetchers_.empty() && resulting_origins_.empty());
 
   // Start three fetchers on random hostnames.
   for (size_t i = 0; i < 3; ++i) {
     std::string url_string("http://");
     for (size_t j = 0; j < kNumCharsInHostnames; ++j)
       url_string += ('a' + base::RandInt(0, 'z' - 'a'));
     GURL random_url(url_string + '/');
     URLFetcher* fetcher = new URLFetcher(random_url, URLFetcher::HEAD, this);
     // We don't want these fetches to affect existing state in the profile.
@@ skipping 97 matching lines @@
   // the same thread.  So just use the heuristic that any all-lowercase a-z
   // hostname with the right number of characters is likely from the detector
   // (and thus should be blocked).
   return ((host.length() == IntranetRedirectDetector::kNumCharsInHostnames) &&
       (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") ==
           std::string::npos)) ?
       net::ERR_NAME_NOT_RESOLVED :
       ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist,
                            os_error);
 }