Don't generate a certificate browse button or passphrase field if cert path contains SETTINGS:

Made certificate_path_ a string instead of a FilePath.
Modify ConnectToWifiNetwork to take std::string.
BUG=None
TEST=manual

Review URL: http://codereview.chromium.org/2869019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51290 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 36 insertions, 32 deletions

diff --git a/chrome/browser/chromeos/cros/mock_network_library.h b/chrome/browser/chromeos/cros/mock_network_library.h
index 1f0a1c9..f498931 100644
--- a/chrome/browser/chromeos/cros/mock_network_library.h
+++ b/chrome/browser/chromeos/cros/mock_network_library.h
@@ -50,10 +50,14 @@ class MockNetworkLibrary : public NetworkLibrary {
   MOCK_METHOD0(ConnectToPreferredNetworkIfAvailable, bool(void));
   MOCK_METHOD0(PreferredNetworkConnected, bool(void));
   MOCK_METHOD0(PreferredNetworkFailed, bool(void));
-  MOCK_METHOD4(ConnectToWifiNetwork, void(WifiNetwork, const string16&,
-                                          const string16&, const string16&));
-  MOCK_METHOD5(ConnectToWifiNetwork, void(const string16&, const string16&,
-                                          const string16&, const string16&,
+  MOCK_METHOD4(ConnectToWifiNetwork, void(WifiNetwork,
+                                          const std::string&,
+                                          const std::string&,
+                                          const std::string&));
+  MOCK_METHOD5(ConnectToWifiNetwork, void(const std::string&,
+                                          const std::string&,
+                                          const std::string&,
+                                          const std::string&,
                                           bool));
   MOCK_METHOD1(ConnectToCellularNetwork, void(CellularNetwork));
   MOCK_METHOD1(DisconnectFromWirelessNetwork, void(const WirelessNetwork&));
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 8352790..02b0b87 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -359,34 +359,34 @@ bool NetworkLibraryImpl::PreferredNetworkFailed() {
 }
 
 void NetworkLibraryImpl::ConnectToWifiNetwork(WifiNetwork network,
-                                              const string16& password,
-                                              const string16& identity,
-                                              const string16& certpath) {
+                                              const std::string& password,
+                                              const std::string& identity,
+                                              const std::string& certpath) {
   if (CrosLibrary::Get()->EnsureLoaded()) {
     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());
+                     password.empty() ? NULL : password.c_str(),
+                     identity.empty() ? NULL : identity.c_str(),
+                     certpath.empty() ? NULL : certpath.c_str());
   }
 }
 
-void NetworkLibraryImpl::ConnectToWifiNetwork(const string16& ssid,
-                                              const string16& password,
-                                              const string16& identity,
-                                              const string16& certpath,
+void NetworkLibraryImpl::ConnectToWifiNetwork(const std::string& ssid,
+                                              const std::string& password,
+                                              const std::string& identity,
+                                              const std::string& certpath,
                                               bool auto_connect) {
   if (CrosLibrary::Get()->EnsureLoaded()) {
     // First create a service from hidden network.
-    ServiceInfo* service = GetWifiService(UTF16ToUTF8(ssid).c_str(),
+    ServiceInfo* service = GetWifiService(ssid.c_str(),
                                           SECURITY_UNKNOWN);
     if (service) {
       // Set auto-connect.
       SetAutoConnect(service->service_path, auto_connect);
       // Now connect to that service.
       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());
+                       password.empty() ? NULL : password.c_str(),
+                       identity.empty() ? NULL : identity.c_str(),
+                       certpath.empty() ? NULL : certpath.c_str());
 
       // Clean up ServiceInfo object.
       FreeServiceInfo(service);
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 543105d..1e8faf9 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -322,15 +322,15 @@ class NetworkLibrary {
 
   // Connect to the specified wireless network with password.
   virtual void ConnectToWifiNetwork(WifiNetwork network,
-                                    const string16& password,
-                                    const string16& identity,
-                                    const string16& certpath) = 0;
+                                    const std::string& password,
+                                    const std::string& identity,
+                                    const std::string& certpath) = 0;
 
   // Connect to the specified wifi ssid with password.
-  virtual void ConnectToWifiNetwork(const string16& ssid,
-                                    const string16& password,
-                                    const string16& identity,
-                                    const string16& certpath,
+  virtual void ConnectToWifiNetwork(const std::string& ssid,
+                                    const std::string& password,
+                                    const std::string& identity,
+                                    const std::string& certpath,
                                     bool auto_connect) = 0;
 
   // Connect to the specified cellular network.
@@ -442,13 +442,13 @@ class NetworkLibraryImpl : public NetworkLibrary,
   virtual bool PreferredNetworkConnected();
   virtual bool PreferredNetworkFailed();
   virtual void ConnectToWifiNetwork(WifiNetwork network,
-                                    const string16& password,
-                                    const string16& identity,
-                                    const string16& certpath);
-  virtual void ConnectToWifiNetwork(const string16& ssid,
-                                    const string16& password,
-                                    const string16& identity,
-                                    const string16& certpath,
+                                    const std::string& password,
+                                    const std::string& identity,
+                                    const std::string& certpath);
+  virtual void ConnectToWifiNetwork(const std::string& ssid,
+                                    const std::string& password,
+                                    const std::string& identity,
+                                    const std::string& certpath,
                                     bool auto_connect);
   virtual void ConnectToCellularNetwork(CellularNetwork network);
   virtual void DisconnectFromWirelessNetwork(const WirelessNetwork& network);