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

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

Issue 6705031: Send policy blobs to session_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 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
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 66d872d405e883ee6a25a01bce8a98c8b69a0dbb..130edf05e7f54cc8d6f78ad2033d54aeb5e11cd9 100644
--- a/chrome/browser/policy/cloud_policy_controller_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_controller_unittest.cc
@@ -6,11 +6,11 @@
#include "base/message_loop.h"
#include "base/scoped_temp_dir.h"
-#include "chrome/browser/policy/cloud_policy_cache.h"
#include "chrome/browser/policy/device_token_fetcher.h"
#include "chrome/browser/policy/proto/device_management_backend.pb.h"
#include "chrome/browser/policy/mock_configuration_policy_store.h"
#include "chrome/browser/policy/mock_device_management_backend.h"
+#include "chrome/browser/policy/user_policy_cache.h"
#include "content/browser/browser_thread.h"
#include "policy/policy_constants.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -54,7 +54,7 @@ ACTION_P2(MockCloudPolicyIdentityStrategyGetCredentials, username, auth_token) {
class MockDeviceTokenFetcher : public DeviceTokenFetcher {
public:
- explicit MockDeviceTokenFetcher(CloudPolicyCache* cache)
+ explicit MockDeviceTokenFetcher(CloudPolicyCacheBase* cache)
: DeviceTokenFetcher(NULL, cache) {}
virtual ~MockDeviceTokenFetcher() {}
@@ -77,7 +77,7 @@ class CloudPolicyControllerTest : public testing::Test {
virtual void SetUp() {
ASSERT_TRUE(temp_user_data_dir_.CreateUniqueTempDir());
- cache_.reset(new CloudPolicyCache(
+ cache_.reset(new UserPolicyCache(
temp_user_data_dir_.path().AppendASCII("CloudPolicyControllerTest")));
token_fetcher_.reset(new MockDeviceTokenFetcher(cache_.get()));
}
@@ -139,7 +139,7 @@ class CloudPolicyControllerTest : public testing::Test {
}
protected:
- scoped_ptr<CloudPolicyCache> cache_;
+ scoped_ptr<CloudPolicyCacheBase> cache_;
scoped_ptr<CloudPolicyController> controller_;
scoped_ptr<MockDeviceTokenFetcher> token_fetcher_;
MockCloudPolicyIdentityStrategy identity_strategy_;

Powered by Google App Engine
This is Rietveld 408576698