Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/intranet_redirect_detector.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/intranet_redirect_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
@@ skipping 21 matching lines @@
   // long enough to be after startup, but still get results back quickly.
   // Ideally, instead of this timer, we'd do something like "check if the
   // browser is starting up, and if so, come back later", but there is currently
   // no function to do this.
   static const int kStartFetchDelaySeconds = 7;
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&IntranetRedirectDetector::FinishSleep,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(kStartFetchDelaySeconds));
 
-  net::NetworkChangeNotifier::AddIPAddressObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
 }
 
 IntranetRedirectDetector::~IntranetRedirectDetector() {
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
   STLDeleteElements(&fetchers_);
 }
 
 // static
 GURL IntranetRedirectDetector::RedirectOrigin() {
   const IntranetRedirectDetector* const detector =
       g_browser_process->intranet_redirect_detector();
   return detector ? detector->redirect_origin_ : GURL();
 }
 
@@ skipping 79 matching lines @@
     DCHECK(resulting_origins_.size() == 2);
     redirect_origin_ = net::RegistryControlledDomainService::SameDomainOrHost(
         resulting_origins_.back(), origin) ? origin : GURL();
   }
 
   g_browser_process->local_state()->SetString(
       prefs::kLastKnownIntranetRedirectOrigin, redirect_origin_.is_valid() ?
           redirect_origin_.spec() : std::string());
 }
 
-void IntranetRedirectDetector::OnIPAddressChanged() {
+void IntranetRedirectDetector::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  // Wait until network is up.
+  if (type == net::NetworkChangeNotifier::CONNECTION_NONE)
+    return;
   // If a request is already scheduled, do not scheduled yet another one.
   if (in_sleep_)
     return;
 
   // Since presumably many programs open connections after network changes,
   // delay this a little bit.
   in_sleep_ = true;
   static const int kNetworkSwitchDelayMS = 1000;
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&IntranetRedirectDetector::FinishSleep,
@@ skipping 16 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);
 }