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

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

Issue 8467011: Include only policy definitions that apply to the platfrom in the policy definition list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed dead declarations. Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/asynchronous_policy_provider_unittest.cc
diff --git a/chrome/browser/policy/asynchronous_policy_provider_unittest.cc b/chrome/browser/policy/asynchronous_policy_provider_unittest.cc
index fec42a16c410a82f5e4c7237d497fd5613ff94a1..95c51ab433ecf5084c24e962fbde53bef6648579 100644
--- a/chrome/browser/policy/asynchronous_policy_provider_unittest.cc
+++ b/chrome/browser/policy/asynchronous_policy_provider_unittest.cc
@@ -11,9 +11,9 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-using ::testing::_;
using ::testing::InSequence;
using ::testing::Return;
+using ::testing::_;
namespace policy {
@@ -22,10 +22,11 @@ TEST_F(AsynchronousPolicyTestBase, Provide) {
InSequence s;
DictionaryValue* policies = new DictionaryValue();
policies->SetBoolean(policy::key::kSyncDisabled, true);
- EXPECT_CALL(*delegate_, Load()).WillOnce(Return(policies));
+ ProviderDelegateMock* delegate = new ProviderDelegateMock();
+ EXPECT_CALL(*delegate, Load()).WillOnce(Return(policies));
AsynchronousPolicyProvider provider(
GetChromePolicyDefinitionList(),
- new AsynchronousPolicyLoader(delegate_.release(), 10));
+ new AsynchronousPolicyLoader(delegate, 10));
PolicyMap policy_map;
provider.Provide(&policy_map);
EXPECT_TRUE(policy_map.Get(policy::kPolicySyncDisabled));
@@ -38,17 +39,17 @@ TEST_F(AsynchronousPolicyTestBase, ProvideAfterRefresh) {
InSequence s;
DictionaryValue* original_policies = new DictionaryValue();
original_policies->SetBoolean(policy::key::kSyncDisabled, true);
- EXPECT_CALL(*delegate_, Load()).WillOnce(Return(original_policies));
+ ProviderDelegateMock* delegate = new ProviderDelegateMock();
+ EXPECT_CALL(*delegate, Load()).WillOnce(Return(original_policies));
DictionaryValue* refresh_policies = new DictionaryValue();
refresh_policies->SetBoolean(
policy::key::kJavascriptEnabled,
true);
- EXPECT_CALL(*delegate_, Load()).WillOnce(Return(refresh_policies));
- AsynchronousPolicyLoader* loader =
- new AsynchronousPolicyLoader(delegate_.release(), 10);
+ EXPECT_CALL(*delegate, Load()).WillOnce(Return(refresh_policies));
+ AsynchronousPolicyLoader* loader = new AsynchronousPolicyLoader(delegate, 10);
AsynchronousPolicyProvider provider(GetChromePolicyDefinitionList(), loader);
loop_.RunAllPending();
- loader->Reload();
+ provider.ForceReload();
PolicyMap policy_map;
provider.Provide(&policy_map);
EXPECT_TRUE(policy_map.Get(policy::kPolicySyncDisabled));
« no previous file with comments | « chrome/browser/policy/asynchronous_policy_provider.cc ('k') | chrome/browser/policy/asynchronous_policy_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698