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

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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 | 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 "chrome/browser/policy/user_cloud_policy_manager_chromeos.h" 5 #include "chrome/browser/policy/user_cloud_policy_manager_chromeos.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.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 "chrome/browser/policy/cloud_policy_constants.h" 10 #include "chrome/browser/policy/cloud_policy_constants.h"
(...skipping 17 matching lines...) Expand all
28 28
29 namespace policy { 29 namespace policy {
30 namespace { 30 namespace {
31 31
32 class UserCloudPolicyManagerChromeOSTest : public testing::Test { 32 class UserCloudPolicyManagerChromeOSTest : public testing::Test {
33 protected: 33 protected:
34 UserCloudPolicyManagerChromeOSTest() 34 UserCloudPolicyManagerChromeOSTest()
35 : store_(NULL) {} 35 : store_(NULL) {}
36 36
37 virtual void SetUp() OVERRIDE { 37 virtual void SetUp() OVERRIDE {
38 chrome::RegisterLocalState(prefs_.registry(), &prefs_); 38 chrome::RegisterLocalState(&prefs_, prefs_.registry());
39 39
40 // Set up a policy map for testing. 40 // Set up a policy map for testing.
41 policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 41 policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
42 base::Value::CreateStringValue("value")); 42 base::Value::CreateStringValue("value"));
43 expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) 43 expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
44 .CopyFrom(policy_map_); 44 .CopyFrom(policy_map_);
45 45
46 // Create a fake policy blob to deliver to the client. 46 // Create a fake policy blob to deliver to the client.
47 em::PolicyData policy_data; 47 em::PolicyData policy_data;
48 policy_data.set_policy_type(dm_protocol::kChromeUserPolicyType); 48 policy_data.set_policy_type(dm_protocol::kChromeUserPolicyType);
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 // Cancelling the initial fetch should flip the flag. 157 // Cancelling the initial fetch should flip the flag.
158 EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get())); 158 EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get()));
159 manager_->CancelWaitForPolicyFetch(); 159 manager_->CancelWaitForPolicyFetch();
160 EXPECT_TRUE(manager_->IsInitializationComplete(POLICY_DOMAIN_CHROME)); 160 EXPECT_TRUE(manager_->IsInitializationComplete(POLICY_DOMAIN_CHROME));
161 Mock::VerifyAndClearExpectations(&observer_); 161 Mock::VerifyAndClearExpectations(&observer_);
162 } 162 }
163 163
164 } // namespace 164 } // namespace
165 } // namespace policy 165 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/url_blacklist_manager.cc ('k') | chrome/browser/policy/user_policy_signin_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698