API for connection type (Ethernet/WIFI/WWAN ...) in NetworkChangeNotifier.

net/url_request/url_request_throttler_manager.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 "net/url_request/url_request_throttler_manager.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 12 matching lines @@
 scoped_refptr<URLRequestThrottlerEntryInterface>
     URLRequestThrottlerManager::RegisterRequestUrl(const GURL &url) {
   DCHECK(!enable_thread_checks_ || CalledOnValidThread());
 
   if (registered_from_thread_ == base::kInvalidThreadId) {
     // We can't currently do this in the constructor as it is run on the
     // UI thread and notifications go to the thread from which they are
     // registered.
     // TODO(joi): Clean this up once this is no longer a Singleton.
     NetworkChangeNotifier::AddIPAddressObserver(this);
-    NetworkChangeNotifier::AddOnlineStateObserver(this);
+    NetworkChangeNotifier::AddConnectionStateObserver(this);
     registered_from_thread_ = base::PlatformThread::CurrentId();
   }
 
   // Normalize the url.
   std::string url_id = GetIdFromUrl(url);
 
   // Periodically garbage collect old entries.
   GarbageCollectEntriesIfNecessary();
 
   // Find the entry in the map or create a new NULL entry.
@@ skipping 95 matching lines @@
 }
 
 NetLog* URLRequestThrottlerManager::net_log() const {
   return net_log_->net_log();
 }
 
 void URLRequestThrottlerManager::OnIPAddressChanged() {
   OnNetworkChange();
 }
 
-void URLRequestThrottlerManager::OnOnlineStateChanged(bool online) {
+void URLRequestThrottlerManager::OnConnectionStateChanged(
+    NetworkChangeNotifier::ConnectionState state) {
   OnNetworkChange();
 }
 
 // TODO(joi): Turn throttling on by default when appropriate.
 URLRequestThrottlerManager::URLRequestThrottlerManager()
     : requests_since_last_gc_(0),
       enforce_throttling_(false),
       enable_thread_checks_(false),
       logged_for_localhost_disabled_(false),
       registered_from_thread_(base::kInvalidThreadId) {
@@ skipping 16 matching lines @@
   // Destruction is on main thread (AtExit), but real use is on I/O thread.
   // The AtExit manager does not run until the I/O thread has finished
   // processing.
   DetachFromThread();
 
   // We must currently skip this in the production case, where the destructor
   // does not run on the thread we registered from.
   // TODO(joi): Fix once we are no longer a Singleton.
   if (base::PlatformThread::CurrentId() == registered_from_thread_) {
     NetworkChangeNotifier::RemoveIPAddressObserver(this);
-    NetworkChangeNotifier::RemoveOnlineStateObserver(this);
+    NetworkChangeNotifier::RemoveConnectionStateObserver(this);
   }
 
   // Since, for now, the manager object might conceivably go away before
   // the entries, detach the entries' back-pointer to the manager.
   //
   // TODO(joi): Revisit whether to make entries non-refcounted.
   UrlEntryMap::iterator i = url_entries_.begin();
   while (i != url_entries_.end()) {
     if (i->second != NULL) {
       i->second->DetachManager();
@@ skipping 41 matching lines @@
 void URLRequestThrottlerManager::OnNetworkChange() {
   // Remove all entries.  Any entries that in-flight requests have a reference
   // to will live until those requests end, and these entries may be
   // inconsistent with new entries for the same URLs, but since what we
   // want is a clean slate for the new connection state, this is OK.
   url_entries_.clear();
   requests_since_last_gc_ = 0;
 }
 
 }  // namespace net