Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Side by Side Diff: chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc

Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2017 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 13 matching lines...) Expand all
24 #include "chromeos/cryptohome/mock_async_method_caller.h" 24 #include "chromeos/cryptohome/mock_async_method_caller.h"
25 #include "chromeos/dbus/fake_cryptohome_client.h" 25 #include "chromeos/dbus/fake_cryptohome_client.h"
26 #include "chromeos/settings/cros_settings_names.h" 26 #include "chromeos/settings/cros_settings_names.h"
27 #include "content/public/test/test_browser_thread_bundle.h" 27 #include "content/public/test/test_browser_thread_bundle.h"
28 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
29 29
30 using testing::_; 30 using testing::_;
31 using testing::DoAll; 31 using testing::DoAll;
32 using testing::Invoke; 32 using testing::Invoke;
33 using testing::Return; 33 using testing::Return;
34 using testing::SetArgumentPointee; 34 using testing::SetArgPointee;
35 using testing::StrictMock; 35 using testing::StrictMock;
36 using testing::WithArgs; 36 using testing::WithArgs;
37 37
38 namespace chromeos { 38 namespace chromeos {
39 namespace attestation { 39 namespace attestation {
40 40
41 namespace { 41 namespace {
42 42
43 const char kTestID[] = "test_id"; 43 const char kTestID[] = "test_id";
44 const char kTestChallenge[] = "test_challenge"; 44 const char kTestChallenge[] = "test_challenge";
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 TEST_F(PlatformVerificationFlowTest, AttestationNotPrepared) { 395 TEST_F(PlatformVerificationFlowTest, AttestationNotPrepared) {
396 fake_cryptohome_client_.set_attestation_enrolled(false); 396 fake_cryptohome_client_.set_attestation_enrolled(false);
397 fake_cryptohome_client_.set_attestation_prepared(false); 397 fake_cryptohome_client_.set_attestation_prepared(false);
398 verifier_->ChallengePlatformKey(NULL, kTestID, kTestChallenge, callback_); 398 verifier_->ChallengePlatformKey(NULL, kTestID, kTestChallenge, callback_);
399 base::RunLoop().RunUntilIdle(); 399 base::RunLoop().RunUntilIdle();
400 EXPECT_EQ(PlatformVerificationFlow::PLATFORM_NOT_VERIFIED, result_); 400 EXPECT_EQ(PlatformVerificationFlow::PLATFORM_NOT_VERIFIED, result_);
401 } 401 }
402 402
403 } // namespace attestation 403 } // namespace attestation
404 } // namespace chromeos 404 } // namespace chromeos
OLDNEW
« no previous file with comments | « base/nix/xdg_util_unittest.cc ('k') | chrome/browser/chromeos/customization/customization_document_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698