chromium-os:5494 Networks with identical names not handled properly.

chrome/browser/chromeos/cros/network_library.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/chromeos/cros/network_library.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 432 matching lines @@
   }
 
   void RemoveObserver(Observer* observer) {
     observers_.RemoveObserver(observer);
   }
 
   virtual const EthernetNetwork& ethernet_network() const { return ethernet_; }
   virtual bool ethernet_connecting() const { return ethernet_.connecting(); }
   virtual bool ethernet_connected() const { return ethernet_.connected(); }
 
-  virtual const std::string& wifi_name() const { return wifi_.name(); }
+  virtual const WifiNetwork& wifi_network() const { return wifi_; }
   virtual bool wifi_connecting() const { return wifi_.connecting(); }
   virtual bool wifi_connected() const { return wifi_.connected(); }
-  virtual int wifi_strength() const { return wifi_.strength(); }
 
-  virtual const std::string& cellular_name() const { return cellular_.name(); }
-  virtual const std::string& cellular_service_path() const {
-    return cellular_.service_path(); }
+  virtual const CellularNetwork& cellular_network() const { return cellular_; }
   virtual bool cellular_connecting() const { return cellular_.connecting(); }
   virtual bool cellular_connected() const { return cellular_.connected(); }
-  virtual int cellular_strength() const { return cellular_.strength(); }
 
   bool Connected() const {
     return ethernet_connected() || wifi_connected() || cellular_connected();
   }
 
   bool Connecting() const {
     return ethernet_connecting() || wifi_connecting() || cellular_connecting();
   }
 
   const std::string& IPAddress() const {
@@ skipping 359 matching lines @@
     DCHECK(network);
     network->UpdateNetworkStatus();
   }
 
   static void DataPlanUpdateHandler(void* object,
                                     const char* modem_service_path,
                                     const CellularDataPlanList* dataplan) {
     NetworkLibraryImpl* network = static_cast<NetworkLibraryImpl*>(object);
     DCHECK(network);
     // Store data plan for currently connected cellular network.
-    if (network->cellular_service_path().compare(modem_service_path) == 0) {
+    if (network->cellular_network().service_path()
+        .compare(modem_service_path) == 0) {
       if (dataplan != NULL) {
         network->UpdateCellularDataPlan(*dataplan);
       }
     }
   }
 
   static void ParseSystem(SystemInfo* system,
       EthernetNetwork* ethernet,
       WifiNetworkVector* wifi_networks,
       CellularNetworkVector* cellular_networks,
@@ skipping 316 matching lines @@
  public:
   NetworkLibraryStubImpl() : ip_address_("1.1.1.1") {}
   ~NetworkLibraryStubImpl() {}
   void AddObserver(Observer* observer) {}
   void RemoveObserver(Observer* observer) {}
   virtual const EthernetNetwork& ethernet_network() const {
     return ethernet_;
   }
   virtual bool ethernet_connecting() const { return false; }
   virtual bool ethernet_connected() const { return true; }
-  virtual const std::string& wifi_name() const { return EmptyString(); }
+  virtual const WifiNetwork& wifi_network() const {
+    return wifi_;
+  }
   virtual bool wifi_connecting() const { return false; }
   virtual bool wifi_connected() const { return false; }
-  virtual int wifi_strength() const { return 0; }
-
-  virtual const std::string& cellular_name() const { return EmptyString(); }
-  virtual const std::string& cellular_service_path() const {
-    return EmptyString(); }
+  virtual const CellularNetwork& cellular_network() const {
+    return cellular_;
+  }
   virtual bool cellular_connecting() const { return false; }
   virtual bool cellular_connected() const { return false; }
-  virtual int cellular_strength() const { return false; }
 
   bool Connected() const { return true; }
   bool Connecting() const { return false; }
   const std::string& IPAddress() const { return ip_address_; }
   virtual const WifiNetworkVector& wifi_networks() const {
     return wifi_networks_;
   }
   virtual const WifiNetworkVector& remembered_wifi_networks() const {
     return wifi_networks_;
   }
@@ skipping 43 matching lines @@
   virtual void EnableOfflineMode(bool enable) {}
   virtual NetworkIPConfigVector GetIPConfigs(const std::string& device_path) {
     return NetworkIPConfigVector();
   }
   virtual std::string GetHtmlInfo(int refresh) { return std::string(); }
   virtual void UpdateSystemInfo() {}
 
  private:
   std::string ip_address_;
   EthernetNetwork ethernet_;
+  WifiNetwork wifi_;
+  CellularNetwork cellular_;
   WifiNetworkVector wifi_networks_;
   CellularNetworkVector cellular_networks_;
 };
 
 // static
 NetworkLibrary* NetworkLibrary::GetImpl(bool stub) {
   if (stub)
     return new NetworkLibraryStubImpl();
   else
     return new NetworkLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImpl);