Merge 85338 - Really fix chromium-os:14180 this time.

chrome/browser/chromeos/cros/network_library.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 "chrome/browser/chromeos/cros/network_library.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/time_formatting.h"
@@ skipping 3272 matching lines @@
       // Set active_virtual_ to the first connected or connecting vpn service.
       if (active_virtual_ == NULL && network->connecting_or_connected())
         active_virtual_ = static_cast<VirtualNetwork*>(network);
     }
   }
 
   void AddNetwork(Network* network) {
     std::pair<NetworkMap::iterator,bool> result =
         network_map_.insert(std::make_pair(network->service_path(), network));
     DCHECK(result.second);  // Should only get called with new network.
+    VLOG(2) << "Adding Network: " << network->service_path()
+            << " (" << network->name() << ")";
     ConnectionType type(network->type());
     if (type == TYPE_WIFI) {
       if (wifi_enabled())
         wifi_networks_.push_back(static_cast<WifiNetwork*>(network));
     } else if (type == TYPE_CELLULAR) {
       if (cellular_enabled())
         cellular_networks_.push_back(static_cast<CellularNetwork*>(network));
     } else if (type == TYPE_VPN) {
       virtual_networks_.push_back(static_cast<VirtualNetwork*>(network));
     }
@@ skipping 151 matching lines @@
       if (!service_path.empty()) {
         VLOG(1) << "Watched Service: " << service_path;
         RequestNetworkServiceInfo(
             service_path.c_str(), &NetworkServiceUpdate, this);
       }
     }
   }
 
   // Request the active profile which lists the remembered networks.
   void RequestRememberedNetworksUpdate() {
-    RequestNetworkProfile(
-        active_profile_path_.c_str(), &ProfileUpdate, this);
+    if (!active_profile_path_.empty()) {
+      RequestNetworkProfile(
+          active_profile_path_.c_str(), &ProfileUpdate, this);
+    }
   }
 
   // Update the list of remembered (profile) networks, and request associated
   // service updates.
   void UpdateRememberedServiceList(const char* profile_path,
                                    const ListValue* profile_entries) {
     // Copy the list of existing networks to "old" and clear the map and list.
     NetworkMap old_network_map = remembered_network_map_;
     ClearRememberedNetworks(false /*don't delete*/);
     // |profile_entries| represents a complete list of remembered networks.
@@ skipping 160 matching lines @@
     NetworkDeviceMap old_device_map = device_map_;
     device_map_.clear();
     VLOG(2) << "Updating Device List.";
     for (ListValue::const_iterator iter = devices->begin();
          iter != devices->end(); ++iter) {
       std::string device_path;
       (*iter)->GetAsString(&device_path);
       if (!device_path.empty()) {
         NetworkDeviceMap::iterator found = old_device_map.find(device_path);
         if (found != old_device_map.end()) {
-          VLOG(2) << " Adding device: " << device_path;
+          VLOG(2) << " Adding existing device: " << device_path;
           device_map_[device_path] = found->second;
           old_device_map.erase(found);
-          // Add device property monitor before we request the
-          // full property list, to ensure that we won't miss any
-          // property changes.
-          network_device_observers_[device_path] =
-              new NetworkDeviceObserverList(this, device_path);
-
         }
         RequestNetworkDeviceInfo(
             device_path.c_str(), &NetworkDeviceUpdate, this);
       }
     }
     // Delete any old devices that no longer exist.
     for (NetworkDeviceMap::iterator iter = old_device_map.begin();
          iter != old_device_map.end(); ++iter) {
       DeleteDeviceFromDeviceObserversMap(iter->first);
       // Delete device.
@@ skipping 28 matching lines @@
   void ParseNetworkDevice(const std::string& device_path,
                           const DictionaryValue* info) {
     NetworkDeviceMap::iterator found = device_map_.find(device_path);
     NetworkDevice* device;
     if (found != device_map_.end()) {
       device = found->second;
     } else {
       device = new NetworkDevice(device_path);
       VLOG(2) << " Adding device: " << device_path;
       device_map_[device_path] = device;
+      if (network_device_observers_.find(device_path) ==
+          network_device_observers_.end()) {
+        network_device_observers_[device_path] =
+            new NetworkDeviceObserverList(this, device_path);
+      }
     }
     device->ParseInfo(info);
     VLOG(1) << "ParseNetworkDevice:" << device->name();
     NotifyNetworkManagerChanged(false);  // Not forced.
   }
 
   ////////////////////////////////////////////////////////////////////////////
 
   void EnableNetworkDeviceType(ConnectionType device, bool enable) {
     if (!EnsureCrosLoaded())
@@ skipping 685 matching lines @@
     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);