Refactor the client certificate code in chromeos/network/.

chromeos/network/network_connection_handler.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 CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
 
 #include <set>
 #include <string>
 
@@ skipping 146 matching lines @@
       scoped_ptr<base::DictionaryValue> error_data);
 
   // Handle success or failure from Shill.Service.Connect.
   void HandleShillConnectSuccess(const std::string& service_path);
   void HandleShillConnectFailure(const std::string& service_path,
                                  const std::string& error_name,
                                  const std::string& error_message);
 
   void CheckPendingRequest(const std::string service_path);
   void CheckAllPendingRequests();
-  bool CertificateIsConfigured(NetworkUIData* ui_data, std::string* pkcs11_id);
+
+  // Returns the PKCS#11 ID of a cert matching the certificate pattern in
+  // |ui_data|. Returns empty string otherwise.
+  std::string CertificateIsConfigured(NetworkUIData* ui_data);
   void ErrorCallbackForPendingRequest(const std::string& service_path,
                                       const std::string& error_name);
 
   // Calls Shill.Manager.Disconnect asynchronously.
   void CallShillDisconnect(
       const std::string& service_path,
       const base::Closure& success_callback,
       const network_handler::ErrorCallback& error_callback);
 
   // Handle success from Shill.Service.Disconnect.
@@ skipping 24 matching lines @@
   // Track certificate loading state.
   bool logged_in_;
   bool certificates_loaded_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_