This is the first pass at making GetIPConfigs asynchronous.

chrome/browser/chromeos/cros/network_library.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 562 matching lines @@
   void set_ui_data(const NetworkUIData& ui_data) {
     ui_data_ = ui_data;
   }
   void set_client_cert_pattern(const CertificatePattern& pattern) {
     ui_data_.set_certificate_pattern(pattern);
   }
   void set_client_cert_type(ClientCertType type) {
     ui_data_.set_certificate_type(type);
   }
 
+  // Set the profile path and update the flimfalm property.
+  void SetProfilePath(const std::string& profile_path);
+
+  // Trigger an asynchronous initialization the IP address field.
+  void InitIPAddress();

[stevenjb, 2012/11/12 21:17:27]

nit: blank line here

[Greg Spencer (Chromium), 2012/11/12 21:39:35]

Done.

+  // Initialize the IP address field.
+  static void InitIPAddressCallback(
+      const std::string& service_path,
+      const NetworkIPConfigVector& ip_configs,
+      const std::string& hardware_address);
+
   std::string device_path_;
   std::string name_;
   std::string ip_address_;
   ConnectionMode mode_;
   ConnectionState state_;
   ConnectionError error_;
   bool connectable_;
   bool connection_started_;
   bool is_active_;
   int priority_;  // determines order in network list.
   bool auto_connect_;
   bool save_credentials_;  // save passphrase and EAP credentials to disk.
   std::string proxy_config_;  // ProxyConfig property in shill.
   ProxyOncConfig proxy_onc_config_;  // Only used for parsing ONC proxy value.
   scoped_ptr<EnrollmentDelegate> enrollment_delegate_;
 
   // Unique identifier, set the first time the network is parsed.
   std::string unique_id_;
 
-  // Set the profile path and update the flimfalm property.
-  void SetProfilePath(const std::string& profile_path);
-
-  // Initialize the IP address field
-  void InitIPAddress();
-
   // Priority value, corresponds to index in list from shill (0 = first)
   int priority_order_;
 
   // Set to true if the UI requested this as a new network.
   bool added_;
 
   // Set to true when a new connection failure occurs; cleared when observers
   // are notified.
   bool notify_failure_;
 
@@ skipping 583 matching lines @@
   }
 
   // Network overrides.
   virtual void EraseCredentials() OVERRIDE;
   virtual void CalculateUniqueId() OVERRIDE;
 
   bool passphrase_required_;
   std::string eap_identity_;
   std::string eap_passphrase_;
 
-  // Weak pointer factory for wrapping pointers to this network in callbacks.
-  base::WeakPtrFactory<WimaxNetwork> weak_pointer_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(WimaxNetwork);
 };
 
 typedef std::vector<WimaxNetwork*> WimaxNetworkVector;
 
 // Geolocation data.
 struct CellTower {
   CellTower();
 
   enum RadioType {
@@ skipping 460 matching lines @@
 
   // Enables/disables the wimax network device.
   virtual void EnableWimaxNetworkDevice(bool enable) = 0;
 
   // Enables/disables the cellular network device.
   virtual void EnableCellularNetworkDevice(bool enable) = 0;
 
   // Enables/disables offline mode.
   virtual void EnableOfflineMode(bool enable) = 0;
 
-  // Fetches IP configs and hardware address for a given device_path.
-  // The hardware address is usually a MAC address like "0011AA22BB33".
+  // Fetches IP configs and hardware address for a given device_path and returns
+  // them via the given callback.
+  virtual void GetIPConfigs(const std::string& device_path,
+                            HardwareAddressFormat format,
+                            const NetworkGetIPConfigsCallback& callback) = 0;
+
+  // DEPRECATED: DO NOT USE. Instead, use the asynchronous GetIPConfigs above.
+  // Fetches IP configs and hardware address for a given device_path. The
+  // hardware address is usually a MAC address like "0011AA22BB33".
   // |hardware_address| will be an empty string, if no hardware address is
   // found.
-  virtual NetworkIPConfigVector GetIPConfigs(
+  virtual NetworkIPConfigVector GetIPConfigsAndBlock(
       const std::string& device_path,
       std::string* hardware_address,
       HardwareAddressFormat) = 0;
 
   // Sets the configuration of the IP parameters. This is called when user
   // changes IP settings from dhcp to static or vice versa or when user changes
   // the ip config info. If nothing is changed, this method does nothing.
   // |dhcp_usage_mask| is a bitmask composed of items from the UseDHCP enum, and
   // indicates which of the supplied values are overridden by values given by
   // the default IP acquisition technique for the service (DHCP, usually).
@@ skipping 27 matching lines @@
                                 const std::string& service_path) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_