Restructured PlatformVerificationFlow testing.

chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc

 // Copyright 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 "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
@@ skipping 57 matching lines @@
                 const std::string& signature,
                 const std::string& platform_key_certificate) {
     result_ = result;
     operation_complete_ = true;
   }
 
   // Synchronously do what the content protection code path does when it wants
   // to verify a Chrome OS platform.
   PlatformVerificationFlow::Result SyncContentProtectionAttestation() {
     scoped_refptr<PlatformVerificationFlow> verifier(
-        new PlatformVerificationFlow(NULL, NULL, &fake_cryptohome_client_, NULL,
+        new PlatformVerificationFlow(NULL, NULL, &fake_cryptohome_client_,
                                      NULL));
     verifier->ChallengePlatformKey(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "fake_service_id",
       "fake_challenge",
       base::Bind(&AttestationDevicePolicyTest::Callback, this));
     WaitForAsyncOperation();
     return result_;
   }
 
@@ skipping 26 matching lines @@
             SyncContentProtectionAttestation());
 
   GetDevicePolicyProto()->set_content_protection_enabled(true);
   SyncRefreshDevicePolicy();
 
   EXPECT_NE(PlatformVerificationFlow::POLICY_REJECTED,
             SyncContentProtectionAttestation());
 }
 
 } // namespace policy