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

Side by Side Diff: chrome/browser/policy/cloud_policy_validator_unittest.cc

Issue 11413050: chrome/browser: Update calls from RunAllPending() to RunUntilIdle(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 validator->ValidateDMToken(PolicyBuilder::kFakeToken); 61 validator->ValidateDMToken(PolicyBuilder::kFakeToken);
62 validator->ValidatePolicyType(dm_protocol::kChromeUserPolicyType); 62 validator->ValidatePolicyType(dm_protocol::kChromeUserPolicyType);
63 validator->ValidatePayload(); 63 validator->ValidatePayload();
64 validator->ValidateSignature(public_key, allow_key_rotation_); 64 validator->ValidateSignature(public_key, allow_key_rotation_);
65 if (allow_key_rotation_) 65 if (allow_key_rotation_)
66 validator->ValidateInitialKey(); 66 validator->ValidateInitialKey();
67 67
68 // Run validation and check the result. 68 // Run validation and check the result.
69 EXPECT_CALL(*this, ValidationCompletion(validator)).WillOnce(check_action); 69 EXPECT_CALL(*this, ValidationCompletion(validator)).WillOnce(check_action);
70 validator->StartValidation(); 70 validator->StartValidation();
71 loop_.RunAllPending(); 71 loop_.RunUntilIdle();
72 Mock::VerifyAndClearExpectations(this); 72 Mock::VerifyAndClearExpectations(this);
73 } 73 }
74 74
75 void CheckSuccessfulValidation(UserCloudPolicyValidator* validator) { 75 void CheckSuccessfulValidation(UserCloudPolicyValidator* validator) {
76 EXPECT_TRUE(validator->success()); 76 EXPECT_TRUE(validator->success());
77 EXPECT_EQ(policy_.policy().SerializeAsString(), 77 EXPECT_EQ(policy_.policy().SerializeAsString(),
78 validator->policy()->SerializeAsString()); 78 validator->policy()->SerializeAsString());
79 EXPECT_EQ(policy_.policy_data().SerializeAsString(), 79 EXPECT_EQ(policy_.policy_data().SerializeAsString(),
80 validator->policy_data()->SerializeAsString()); 80 validator->policy_data()->SerializeAsString());
81 EXPECT_EQ(policy_.payload().SerializeAsString(), 81 EXPECT_EQ(policy_.payload().SerializeAsString(),
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 237
238 TEST_F(CloudPolicyValidatorTest, NoRotation) { 238 TEST_F(CloudPolicyValidatorTest, NoRotation) {
239 allow_key_rotation_ = false; 239 allow_key_rotation_ = false;
240 policy_.set_new_signing_key(scoped_ptr<crypto::RSAPrivateKey>()); 240 policy_.set_new_signing_key(scoped_ptr<crypto::RSAPrivateKey>());
241 Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_OK)); 241 Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_OK));
242 } 242 }
243 243
244 } // namespace 244 } // namespace
245 245
246 } // namespace policy 246 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/cloud_policy_subsystem_unittest.cc ('k') | chrome/browser/policy/configuration_policy_provider_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698