Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/google/google_url_tracker.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/google/google_url_tracker.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
@@ skipping 25 matching lines @@
       infobar_creator_(base::Bind(&GoogleURLTrackerInfoBarDelegate::Create)),
       google_url_(mode == UNIT_TEST_MODE ? kDefaultGoogleHomepage :
           profile->GetPrefs()->GetString(prefs::kLastKnownGoogleURL)),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       fetcher_id_(0),
       in_startup_sleep_(true),
       already_fetched_(false),
       need_to_fetch_(false),
       need_to_prompt_(false),
       search_committed_(false) {
-  net::NetworkChangeNotifier::AddIPAddressObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
 
   // Because this function can be called during startup, when kicking off a URL
   // fetch can eat up 20 ms of time, we delay five seconds, which is hopefully
   // 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.
   //
   // In UNIT_TEST mode, where we want to explicitly control when the tracker
   // "wakes up", we do nothing at all.
@@ skipping 180 matching lines @@
               &web_contents->GetController()),
           source, InfoBarService::FromWebContents(web_contents), search_url);
       break;
     }
 
     default:
       NOTREACHED() << "Unknown notification received:" << type;
   }
 }
 
-void GoogleURLTracker::OnIPAddressChanged() {
-  already_fetched_ = false;
-  StartFetchIfDesirable();
+void GoogleURLTracker::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  if (type != net::NetworkChangeNotifier::CONNECTION_NONE) {
+    already_fetched_ = false;
+    StartFetchIfDesirable();
+  }
 }
 
 void GoogleURLTracker::Shutdown() {
   registrar_.RemoveAll();
   weak_ptr_factory_.InvalidateWeakPtrs();
   fetcher_.reset();
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
 void GoogleURLTracker::DeleteMapEntryForService(
     const InfoBarService* infobar_service) {
   // WARNING: |infobar_service| may point to a deleted object.  Do not
   // dereference it!  See OnTabClosed().
   EntryMap::iterator i(entry_map_.find(infobar_service));
   DCHECK(i != entry_map_.end());
   GoogleURLTrackerMapEntry* map_entry = i->second;
 
@@ skipping 237 matching lines @@
   }
   if (registrar_.IsRegistered(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
       content::NotificationService::AllBrowserContextsAndSources())) {
     DCHECK(!search_committed_);
     registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
         content::NotificationService::AllBrowserContextsAndSources());
     registrar_.Remove(this, chrome::NOTIFICATION_INSTANT_COMMITTED,
         content::NotificationService::AllBrowserContextsAndSources());
   }
 }