attestation: Fix policy observer expiry check.

chrome/browser/chromeos/attestation/attestation_policy_observer.h

 // Copyright (c) 2013 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_ATTESTATION_ATTESTATION_POLICY_OBSERVER_H_
 #define CHROME_BROWSER_CHROMEOS_ATTESTATION_ATTESTATION_POLICY_OBSERVER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 45 matching lines @@
 
   // Checks attestation policy and starts any necessary work.
   void Start();
 
   // Gets a new certificate for the Enterprise Machine Key (EMK).
   void GetNewCertificate();
 
   // Gets the existing EMK certificate and sends it to CheckCertificateExpiry.
   void GetExistingCertificate();
 
-  // Checks if the given certificate is expired and, if so, get a new one.
-  void CheckCertificateExpiry(const std::string& certificate);
+  // Checks if any certificate in the given pem_certificate_chain is expired
+  // and, if so, gets a new one. If not renewing, calls CheckIfUploaded.
+  void CheckCertificateExpiry(const std::string& pem_certificate_chain);
 
   // Uploads a certificate to the policy server.
-  void UploadCertificate(const std::string& certificate);
+  void UploadCertificate(const std::string& pem_certificate_chain);
 
   // Checks if a certificate has already been uploaded and, if not, upload.
-  void CheckIfUploaded(const std::string& certificate,
+  void CheckIfUploaded(const std::string& pem_certificate_chain,
                        const std::string& key_payload);
 
   // Gets the payload associated with the EMK and sends it to |callback|.
   void GetKeyPayload(base::Callback<void(const std::string&)> callback);
 
   // Called when a certificate upload operation completes.  On success, |status|
   // will be true.
   void OnUploadComplete(bool status);
 
   // Marks a key as uploaded in the payload proto.
@@ skipping 18 matching lines @@
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<AttestationPolicyObserver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AttestationPolicyObserver);
 };
 
 }  // namespace attestation
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_ATTESTATION_ATTESTATION_POLICY_OBSERVER_H_