Remove deprecated cert path code

BUG=chromium-os:16585
TEST=Ensure chrome + tests compile.

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

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

4 files changed, 4 insertions, 42 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 2fc793d..ceb4ccf 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -433,7 +433,6 @@ std::string ToHtmlTableHeader(const chromeos::Network* network) {
     str += WrapWithTH("Encryption");
     str += WrapWithTH("Passphrase");
     str += WrapWithTH("Identity");
-    str += WrapWithTH("Certificate");
   }
   if (network->type() == chromeos::TYPE_CELLULAR) {
     str += WrapWithTH("Technology");
@@ -472,7 +471,6 @@ std::string ToHtmlTableRow(const chromeos::Network* network) {
     str += WrapWithTD(wifi->GetEncryptionString());
     str += WrapWithTD(std::string(wifi->passphrase().length(), '*'));
     str += WrapWithTD(wifi->identity());
-    str += WrapWithTD(wifi->cert_path());
   }
   if (network->type() == chromeos::TYPE_CELLULAR) {
     const chromeos::CellularNetwork* cell =
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 00879d0..03ad81b 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -118,7 +118,6 @@ enum SimOperationType {
 const char* kSecurityProperty = "Security";
 const char* kPassphraseProperty = "Passphrase";
 const char* kIdentityProperty = "Identity";
-const char* kCertPathProperty = "CertPath";
 const char* kPassphraseRequiredProperty = "PassphraseRequired";
 const char* kSaveCredentialsProperty = "SaveCredentials";
 const char* kProfilesProperty = "Profiles";
@@ -444,7 +443,6 @@ enum PropertyIndex {
   PROPERTY_INDEX_CELLULAR_ALLOW_ROAMING,
   PROPERTY_INDEX_CELLULAR_APN,
   PROPERTY_INDEX_CELLULAR_LAST_GOOD_APN,
-  PROPERTY_INDEX_CERT_PATH,
   PROPERTY_INDEX_CONNECTABLE,
   PROPERTY_INDEX_CONNECTED_TECHNOLOGIES,
   PROPERTY_INDEX_CONNECTIVITY_STATE,
@@ -537,7 +535,6 @@ StringToEnum<PropertyIndex>::Pair property_index_table[] = {
   { kCellularApnProperty, PROPERTY_INDEX_CELLULAR_APN },
   { kCellularLastGoodApnProperty, PROPERTY_INDEX_CELLULAR_LAST_GOOD_APN },
   { kCarrierProperty, PROPERTY_INDEX_CARRIER },
-  { kCertPathProperty, PROPERTY_INDEX_CERT_PATH },
   { kConnectableProperty, PROPERTY_INDEX_CONNECTABLE },
   { kConnectedTechnologiesProperty, PROPERTY_INDEX_CONNECTED_TECHNOLOGIES },
   { kDefaultTechnologyProperty, PROPERTY_INDEX_DEFAULT_TECHNOLOGY },
@@ -2063,8 +2060,6 @@ bool WifiNetwork::ParseValue(int index, const Value* value) {
       return value->GetAsBoolean(&passphrase_required_);
     case PROPERTY_INDEX_IDENTITY:
       return value->GetAsString(&identity_);
-    case PROPERTY_INDEX_CERT_PATH:
-      return value->GetAsString(&cert_path_);
     case PROPERTY_INDEX_EAP_IDENTITY:
       return value->GetAsString(&eap_identity_);
     case PROPERTY_INDEX_EAP_METHOD: {
@@ -2151,10 +2146,6 @@ void WifiNetwork::SetIdentity(const std::string& identity) {
   SetStringProperty(kIdentityProperty, identity, &identity_);
 }
 
-void WifiNetwork::SetCertPath(const std::string& cert_path) {
-  SetStringProperty(kCertPathProperty, cert_path, &cert_path_);
-}
-
 void WifiNetwork::SetEAPMethod(EAPMethod method) {
   eap_method_ = method;
   switch (method) {
@@ -2290,24 +2281,6 @@ bool WifiNetwork::IsPassphraseRequired() const {
   return passphrase_required_;
 }
 
-// Parse 'path' to determine if the certificate is stored in a pkcs#11 device.
-// flimflam recognizes the string "SETTINGS:" to specify authentication
-// parameters. 'key_id=' indicates that the certificate is stored in a pkcs#11
-// device. See src/third_party/flimflam/files/doc/service-api.txt.
-bool WifiNetwork::IsCertificateLoaded() const {
-  static const std::string settings_string("SETTINGS:");
-  static const std::string pkcs11_key("key_id");
-  if (cert_path_.find(settings_string) == 0) {
-    std::string::size_type idx = cert_path_.find(pkcs11_key);
-    if (idx != std::string::npos)
-      idx = cert_path_.find_first_not_of(kWhitespaceASCII,
-                                         idx + pkcs11_key.length());
-    if (idx != std::string::npos && cert_path_[idx] == '=')
-      return true;
-  }
-  return false;
-}
-
 bool WifiNetwork::RequiresUserProfile() const {
   // 8021X requires certificates which are only stored for individual users.
   if (encryption_ == SECURITY_8021X)
@@ -4672,8 +4645,9 @@ class NetworkLibraryImpl : public NetworkLibrary  {
     wifi4->set_connected(false);
     wifi4->set_connectable(false);
     wifi4->set_encryption(SECURITY_8021X);
-    wifi4->set_identity("nobody@google.com");
-    wifi4->set_cert_path("SETTINGS:key_id=3,cert_id=3,pin=111111");
+    wifi4->SetEAPMethod(EAP_METHOD_PEAP);
+    wifi4->SetEAPIdentity("nobody@google.com");
+    wifi4->SetEAPPassphrase("password");
     AddNetwork(wifi4);
 
     WifiNetwork* wifi5 = new WifiNetwork("fw5");
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 02a9d85..45983e8 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -686,7 +686,6 @@ class WifiNetwork : public WirelessNetwork {
   ConnectionSecurity encryption() const { return encryption_; }
   const std::string& passphrase() const { return passphrase_; }
   const std::string& identity() const { return identity_; }
-  const std::string& cert_path() const { return cert_path_; }
   bool passphrase_required() const { return passphrase_required_; }
 
   EAPMethod eap_method() const { return eap_method_; }
@@ -707,7 +706,6 @@ class WifiNetwork : public WirelessNetwork {
   bool SetHexSsid(const std::string& ssid_hex);
   void SetPassphrase(const std::string& passphrase);
   void SetIdentity(const std::string& identity);
-  void SetCertPath(const std::string& cert_path);
 
   // 802.1x properties
   void SetEAPMethod(EAPMethod method);
@@ -729,9 +727,6 @@ class WifiNetwork : public WirelessNetwork {
   // Return true if a passphrase or other input is required to connect.
   bool IsPassphraseRequired() const;
 
-  // Return true if cert_path_ indicates that we have loaded the certificate.
-  bool IsCertificateLoaded() const;
-
  private:
   // Network overrides.
   virtual void EraseCredentials();
@@ -754,15 +749,10 @@ class WifiNetwork : public WirelessNetwork {
   void set_identity(const std::string& identity) {
     identity_ = identity;
   }
-  void set_cert_path(const std::string& cert_path) {
-    cert_path_ = cert_path;
-  }
-
   ConnectionSecurity encryption_;
   std::string passphrase_;
   bool passphrase_required_;
   std::string identity_;
-  std::string cert_path_;
 
   EAPMethod eap_method_;
   EAPPhase2Auth eap_phase_2_auth_;
diff --git a/tools/cros.DEPS/DEPS b/tools/cros.DEPS/DEPS
index eeb870d..00f2011 100644
--- a/tools/cros.DEPS/DEPS
+++ b/tools/cros.DEPS/DEPS
@@ -4,5 +4,5 @@ vars = {
 
 deps = {
   "src/third_party/cros":
-    Var("chromium_git") + "/cros.git@411943e7",
+    Var("chromium_git") + "/cros.git@b8dadccc",
 }