2nd attempt to land http://codereview.chromium.org/1676002 for njw...

chrome/browser/chromeos/cros/network_library.cc

 // Copyright (c) 2009 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 "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 69 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 void NetworkLibraryImpl::RequestWifiScan() {
   if (CrosLibrary::Get()->EnsureLoaded()) {
     RequestScan(TYPE_WIFI);
   }
 }
 
 void NetworkLibraryImpl::ConnectToWifiNetwork(WifiNetwork network,
-                                          const string16& password) {
+                                              const string16& password,
+                                              const string16& identity,
+                                              const string16& certpath) {
   if (CrosLibrary::Get()->EnsureLoaded()) {
-    ConnectToNetwork(network.service_path.c_str(),
-        password.empty() ? NULL : UTF16ToUTF8(password).c_str());
+    ConnectToNetworkWithCertInfo(network.service_path.c_str(),
+                     password.empty() ? NULL : UTF16ToUTF8(password).c_str(),
+                     identity.empty() ? NULL : UTF16ToUTF8(identity).c_str(),
+                     certpath.empty() ? NULL : UTF16ToUTF8(certpath).c_str());
   }
 }
 
 void NetworkLibraryImpl::ConnectToWifiNetwork(const string16& ssid,
-                                          const string16& password) {
+                                              const string16& password,
+                                              const string16& identity,
+                                              const string16& certpath) {
   if (CrosLibrary::Get()->EnsureLoaded()) {
     // First create a service from hidden network.
     ServiceInfo* service = GetWifiService(UTF16ToUTF8(ssid).c_str(),
                                           SECURITY_UNKNOWN);
     // Now connect to that service.
     if (service) {
-      ConnectToNetwork(service->service_path,
-          password.empty() ? NULL : UTF16ToUTF8(password).c_str());
+      ConnectToNetworkWithCertInfo(service->service_path,
+                       password.empty() ? NULL : UTF16ToUTF8(password).c_str(),
+                       identity.empty() ? NULL : UTF16ToUTF8(identity).c_str(),
+                       certpath.empty() ? NULL : UTF16ToUTF8(certpath).c_str());
+
       // Clean up ServiceInfo object.
       FreeServiceInfo(service);
     } else {
       LOG(WARNING) << "Cannot find hidden network: " << ssid;
       // TODO(chocobo): Show error message.
     }
   }
 }
 
 void NetworkLibraryImpl::ConnectToCellularNetwork(CellularNetwork network) {
@@ skipping 299 matching lines @@
   if (ethernet_connected())
     return ethernet_.ip_address;
   if (wifi_connected())
     return wifi_.ip_address;
   if (cellular_connected())
     return cellular_.ip_address;
   return ethernet_.ip_address;
 }
 
 }  // namespace chromeos