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

Unified Diff: chrome/browser/policy/cloud_policy_controller_unittest.cc

Issue 7147015: Move user cloud policy to BrowserProcess (was 6979011) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit_test include breakage Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/cloud_policy_cache_base.cc ('k') | chrome/browser/policy/cloud_policy_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/cloud_policy_controller_unittest.cc
diff --git a/chrome/browser/policy/cloud_policy_controller_unittest.cc b/chrome/browser/policy/cloud_policy_controller_unittest.cc
index a008a1e99c21449fb5c2f9e6b8513afd75333405..7e828db82927fb0d69d55e05478aa91ffa1e355e 100644
--- a/chrome/browser/policy/cloud_policy_controller_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_controller_unittest.cc
@@ -94,7 +94,6 @@ class CloudPolicyControllerTest : public testing::Test {
controller_.reset(); // Unregisters observers.
}
- // Takes ownership of |backend|.
void CreateNewController() {
controller_.reset(new CloudPolicyController(
&service_, cache_.get(), token_fetcher_.get(), &identity_strategy_,
@@ -102,12 +101,10 @@ class CloudPolicyControllerTest : public testing::Test {
}
void ExpectHasSpdyPolicy() {
- MockConfigurationPolicyStore store;
- EXPECT_CALL(store, Apply(_, _)).Times(AtLeast(1));
- cache_->GetManagedPolicyProvider()->Provide(&store);
FundamentalValue expected(true);
- ASSERT_TRUE(store.Get(kPolicyDisableSpdy) != NULL);
- EXPECT_TRUE(store.Get(kPolicyDisableSpdy)->Equals(&expected));
+ const PolicyMap* policy_map = cache_->policy(
+ CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY);
+ ASSERT_TRUE(Value::Equals(&expected, policy_map->Get(kPolicyDisableSpdy)));
}
void SetupIdentityStrategy(
« no previous file with comments | « chrome/browser/policy/cloud_policy_cache_base.cc ('k') | chrome/browser/policy/cloud_policy_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698