Rename NetworkChangeNotifierChromeos to NetworkChangeNotifierNetworkLibrary

chrome/browser/chromeos/net/network_change_notifier_chromeos.cc

Index: chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc b/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
deleted file mode 100644
index 4cc06a43a00a2ffdd155d4f8d2d22dd2a2fb2bb3..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.cc
+++ /dev/null
@@ -1,350 +0,0 @@
-// 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/chromeos/net/network_change_notifier_chromeos.h"
-
-#include <vector>
-
-#include "base/bind.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/root_power_manager_client.h"
-#include "content/public/browser/browser_thread.h"
-#include "net/dns/dns_config_service_posix.h"
-
-using content::BrowserThread;
-
-namespace {
-
-// Delay for online change notification reporting.
-const int kOnlineNotificationDelayMS = 500;
-const int kInitialNotificationCheckDelayMS = 1000;
-
-bool IsOnline(chromeos::ConnectionState state) {
-  return state == chromeos::STATE_ONLINE ||
-         state == chromeos::STATE_PORTAL;
-}
-
-}
-
-namespace chromeos {
-
-class NetworkChangeNotifierChromeos::DnsConfigServiceChromeos
-    : public net::internal::DnsConfigServicePosix {
- public:
-  DnsConfigServiceChromeos() {}
-
-  virtual ~DnsConfigServiceChromeos() {}
-
-  // net::DnsConfigServicePosix:
-  virtual bool StartWatching() OVERRIDE {
-    // Notifications from NetworkLibrary are sent to
-    // NetworkChangeNotifierChromeos.
-    return true;
-  }
-
-  void OnNetworkChange() {
-    InvalidateConfig();
-    InvalidateHosts();
-    ReadNow();
-  }
-};
-
-NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
-    : NetworkChangeNotifier(NetworkChangeCalculatorParamsChromeos()),
-      has_active_network_(false),
-      connection_state_(chromeos::STATE_UNKNOWN),
-      connection_type_(CONNECTION_NONE),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
-  BrowserThread::PostDelayedTask(
-         BrowserThread::UI, FROM_HERE,
-         base::Bind(
-             &NetworkChangeNotifierChromeos::UpdateInitialState, this),
-         base::TimeDelta::FromMilliseconds(kInitialNotificationCheckDelayMS));
-}
-
-NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
-}
-
-void NetworkChangeNotifierChromeos::Init() {
-  chromeos::NetworkLibrary* network_library =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
-  network_library->AddNetworkManagerObserver(this);
-
-  DBusThreadManager::Get()->GetRootPowerManagerClient()->AddObserver(this);
-
-  dns_config_service_.reset(new DnsConfigServiceChromeos());
-  dns_config_service_->WatchConfig(
-      base::Bind(NetworkChangeNotifier::SetDnsConfig));
-
-  UpdateNetworkState(network_library);
-}
-
-void NetworkChangeNotifierChromeos::Shutdown() {
-  weak_factory_.InvalidateWeakPtrs();
-
-  dns_config_service_.reset();
-
-  if (!chromeos::CrosLibrary::Get())
-    return;
-
-  chromeos::NetworkLibrary* lib =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
-  lib->RemoveNetworkManagerObserver(this);
-  lib->RemoveObserverForAllNetworks(this);
-
-  DBusThreadManager::Get()->GetRootPowerManagerClient()->RemoveObserver(this);
-}
-
-void NetworkChangeNotifierChromeos::OnResume(
-    const base::TimeDelta& sleep_duration) {
-  // Force invalidation of various net resources on system resume.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(
-          &NetworkChangeNotifier::NotifyObserversOfIPAddressChange));
-}
-
-
-void NetworkChangeNotifierChromeos::OnNetworkManagerChanged(
-    chromeos::NetworkLibrary* cros) {
-  UpdateNetworkState(cros);
-}
-
-net::NetworkChangeNotifier::ConnectionType
-NetworkChangeNotifierChromeos::GetCurrentConnectionType() const {
-  return connection_type_;
-}
-
-void NetworkChangeNotifierChromeos::OnNetworkChanged(
-    chromeos::NetworkLibrary* cros,
-    const chromeos::Network* network) {
-  CHECK(network);
-
-  // Active network changed?
-  if (network->service_path() != service_path_)
-    UpdateNetworkState(cros);
-  else
-    UpdateConnectivityState(network);
-}
-
-void NetworkChangeNotifierChromeos::UpdateNetworkState(
-    chromeos::NetworkLibrary* lib) {
-  const chromeos::Network* network = lib->active_network();
-  if (network) {
-    lib->GetIPConfigs(
-        network->device_path(),
-        chromeos::NetworkLibrary::FORMAT_COLON_SEPARATED_HEX,
-        base::Bind(&NetworkChangeNotifierChromeos::UpdateNetworkStateCallback,
-                   weak_factory_.GetWeakPtr(),
-                   lib));
-  } else {
-    // If we don't have a network, then we can't fetch ipconfigs, but we still
-    // need to process state updates when we lose a network (i.e. when
-    // has_active_network_ is still set, but we don't have one anymore).
-    NetworkIPConfigVector empty_ipconfigs;
-    UpdateNetworkStateCallback(lib, empty_ipconfigs, "");
-  }
-}
-
-void NetworkChangeNotifierChromeos::UpdateNetworkStateCallback(
-    chromeos::NetworkLibrary* lib,
-    const NetworkIPConfigVector& ipconfigs,
-    const std::string& hardware_address) {
-  const chromeos::Network* network = lib->active_network();
-
-  if (network) {
-    VLOG(1) << "UpdateNetworkStateCallback: " << network->name()
-            << ", type= " << network->type()
-            << ", device= " << network->device_path()
-            << ", state= " << network->state();
-  }
-
-  // Find the DNS servers currently in use. This code assumes that the order of
-  // the |ipconfigs| is stable.
-  std::vector<std::string> ipconfig_name_servers;
-  for (chromeos::NetworkIPConfigVector::const_iterator it = ipconfigs.begin();
-       it != ipconfigs.end(); ++it) {
-    const chromeos::NetworkIPConfig& ipconfig = *it;
-    if (!ipconfig.name_servers.empty())
-      ipconfig_name_servers.push_back(ipconfig.name_servers);
-  }
-
-  // Did we loose the active network?
-  bool lost_active_network = !network && has_active_network_;
-
-  // Did we have a change on the current active network?
-  bool changed_active_network = network && (
-      !has_active_network_ ||
-      network->service_path() != service_path_ ||
-      ipconfig_name_servers != name_servers_ ||
-      network->ip_address() != ip_address_);
-
-  // If just the current active network's state changed, update it if necessary.
-  if (!lost_active_network && !changed_active_network &&
-      network && network->state() != connection_state_) {
-    UpdateConnectivityState(network);
-  }
-
-  if (lost_active_network || changed_active_network) {
-    if (has_active_network_)
-      lib->RemoveObserverForAllNetworks(this);
-    if (!network) {
-      has_active_network_ = false;
-      service_path_.clear();
-      ip_address_.clear();
-      name_servers_.clear();
-    } else {
-      has_active_network_ = true;
-      service_path_ = network->service_path();
-      ip_address_ = network->ip_address();
-      name_servers_.swap(ipconfig_name_servers);
-    }
-    dns_config_service_->OnNetworkChange();
-    UpdateConnectivityState(network);
-    // If there is an active network, add observer to track its changes.
-    if (network)
-      lib->AddNetworkObserver(network->service_path(), this);
-
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(
-            &NetworkChangeNotifier::NotifyObserversOfIPAddressChange));
-  }
-}
-
-void NetworkChangeNotifierChromeos::UpdateConnectivityState(
-      const chromeos::Network* network) {
-  if (network) {
-    VLOG(1) << "UpdateConnectivityState: " << network->name()
-            << ", type= " << network->type()
-            << ", device= " << network->device_path()
-            << ", state= " << network->state()
-            << ", connect= " << connection_state_
-            << ", type= " << connection_type_;
-  }
-
-  // We don't care about all transitions of ConnectionState.  OnlineStateChange
-  // notification should trigger if ConnectionType is changed.
-  chromeos::ConnectionState new_connection_state =
-      network ? network->connection_state() : chromeos::STATE_UNKNOWN;
-
-  ConnectionType prev_connection_type = connection_type_;
-  ConnectionType new_connection_type = GetNetworkConnectionType(network);
-
-  bool is_online = (new_connection_state == chromeos::STATE_ONLINE);
-  bool was_online = (connection_state_ == chromeos::STATE_ONLINE);
-  bool is_portal = (new_connection_state == chromeos::STATE_PORTAL);
-  bool was_portal = (connection_state_ == chromeos::STATE_PORTAL);
-  VLOG(2) << " UpdateConnectivityState2: "
-          << "new_cs = " << new_connection_state
-          << ", is_online = " << is_online
-          << ", was_online = " << was_online
-          << ", is_portal = " << is_portal
-          << ", was_portal = " << was_portal;
-  connection_state_ = new_connection_state;
-  connection_type_ = new_connection_type;
-  if (new_connection_type != prev_connection_type) {
-    VLOG(1) << "UpdateConnectivityState3: "
-            << "prev_connection_type = " << prev_connection_type
-            << ", new_connection_type = " << new_connection_type;
-    ReportConnectionChange();
-  }
-  VLOG(2) << " UpdateConnectivityState4: "
-          << "new_cs = " << new_connection_state
-          << ", end_cs_ = " << connection_state_
-          << "prev_type = " << prev_connection_type
-          << ", new_type_ = " << new_connection_type;
-}
-
-void NetworkChangeNotifierChromeos::ReportConnectionChange() {
-  if (weak_factory_.HasWeakPtrs()) {
-    // If we have a pending task, cancel it.
-    DVLOG(1) << "ReportConnectionChange: has pending task";
-    weak_factory_.InvalidateWeakPtrs();
-    DVLOG(1) << "ReportConnectionChange: canceled pending task";
-  }
-  // Posting task with delay allows us to cancel it when connection type is
-  // changed frequently. This should help us avoid transient edge reporting
-  // while switching between connection types (e.g. ethernet->wifi).
-  BrowserThread::PostDelayedTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(
-          &NetworkChangeNotifierChromeos::ReportConnectionChangeOnUIThread,
-          weak_factory_.GetWeakPtr()),
-      base::TimeDelta::FromMilliseconds(kOnlineNotificationDelayMS));
-}
-
-void NetworkChangeNotifierChromeos::ReportConnectionChangeOnUIThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(
-         &NetworkChangeNotifierChromeos::
-             NotifyObserversOfConnectionTypeChange));
-}
-
-// static
-void NetworkChangeNotifierChromeos::UpdateInitialState(
-    NetworkChangeNotifierChromeos* self) {
-  chromeos::NetworkLibrary* net =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
-  self->UpdateNetworkState(net);
-}
-
-// static
-net::NetworkChangeNotifier::ConnectionType
-NetworkChangeNotifierChromeos::GetNetworkConnectionType(
-    const chromeos::Network* network) {
-  if (!network || !IsOnline(network->connection_state()))
-    return net::NetworkChangeNotifier::CONNECTION_NONE;
-
-  switch (network->type()) {
-    case chromeos::TYPE_ETHERNET:
-      return CONNECTION_ETHERNET;
-    case chromeos::TYPE_WIFI:
-      return CONNECTION_WIFI;
-    case chromeos::TYPE_WIMAX:
-      return CONNECTION_4G;
-    case chromeos::TYPE_CELLULAR:
-      switch (static_cast<const chromeos::CellularNetwork*>(
-          network)->network_technology()) {
-        case chromeos::NETWORK_TECHNOLOGY_UNKNOWN:
-        case chromeos::NETWORK_TECHNOLOGY_1XRTT:
-        case chromeos::NETWORK_TECHNOLOGY_GPRS:
-        case chromeos::NETWORK_TECHNOLOGY_EDGE:
-          return CONNECTION_2G;
-        case chromeos::NETWORK_TECHNOLOGY_GSM:
-        case chromeos::NETWORK_TECHNOLOGY_UMTS:
-        case chromeos::NETWORK_TECHNOLOGY_EVDO:
-        case chromeos::NETWORK_TECHNOLOGY_HSPA:
-          return CONNECTION_3G;
-        case chromeos::NETWORK_TECHNOLOGY_HSPA_PLUS:
-        case chromeos::NETWORK_TECHNOLOGY_LTE:
-        case chromeos::NETWORK_TECHNOLOGY_LTE_ADVANCED:
-          return CONNECTION_4G;
-      }
-    case chromeos::TYPE_BLUETOOTH:
-    case chromeos::TYPE_VPN:
-    case chromeos::TYPE_UNKNOWN:
-      break;
-  }
-  return net::NetworkChangeNotifier::CONNECTION_UNKNOWN;
-}
-
-// static
-net::NetworkChangeNotifier::NetworkChangeCalculatorParams
-NetworkChangeNotifierChromeos::NetworkChangeCalculatorParamsChromeos() {
-  NetworkChangeCalculatorParams params;
-  // Delay values arrived at by simple experimentation and adjusted so as to
-  // produce a single signal when switching between network connections.
-  params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000);
-  params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(1000);
-  params.connection_type_offline_delay_ = base::TimeDelta::FromMilliseconds(0);
-  params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(0);
-  return params;
-}
-
-}  // namespace chromeos