Added support for the content protection profile to AttestationFlow.

chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc

 // 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.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/attestation/attestation_key_payload.pb.h"
@@ skipping 165 matching lines @@
           .WillOnce(WithArgs<1>(Invoke(StatusCallbackSuccess)));
       EXPECT_CALL(cryptohome_client_,
                   TpmAttestationSetKeyPayload(_, _, payload, _))
           .WillOnce(WithArgs<3>(Invoke(DBusCallbackTrue)));
     }
 
     // Setup expected key generations.  Again use WillOnce().  Key generation is
     // another costly operation and if it gets triggered more than once during
     // a single pass this indicates a logical problem in the observer.
     if (new_key) {
-      EXPECT_CALL(attestation_flow_, GetCertificate(_, _, _))
-          .WillOnce(WithArgs<2>(Invoke(CertCallbackSuccess)));
+      EXPECT_CALL(attestation_flow_, GetCertificate(_, _, _, _, _))
+          .WillOnce(WithArgs<4>(Invoke(CertCallbackSuccess)));
     }
   }
 
   void Run() {
     AttestationPolicyObserver observer(&policy_client_,
                                        &cryptohome_client_,
                                        &attestation_flow_);
     observer.set_retry_delay(0);
     base::RunLoop().RunUntilIdle();
   }
@@ skipping 100 matching lines @@
   SetupMocks(MOCK_NEW_KEY, "");
   // Simulate a DBus failure.
   EXPECT_CALL(cryptohome_client_, TpmAttestationDoesKeyExist(_, _, _))
       .WillOnce(WithArgs<2>(Invoke(DBusCallbackError)))
       .WillRepeatedly(WithArgs<2>(Invoke(DBusCallbackFalse)));
   Run();
 }
 
 }  // namespace attestation
 }  // namespace chromeos