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

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

Issue 8499021: UserPolicyCache only becomes ready after policy has been fetched. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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/enterprise_metrics_browsertest.cc
diff --git a/chrome/browser/policy/enterprise_metrics_browsertest.cc b/chrome/browser/policy/enterprise_metrics_browsertest.cc
index 3956a5cb0a741d78b1ad872692e280e355ed1ac4..2c596f1432293d31c1802da973f7bd13dd24661f 100644
--- a/chrome/browser/policy/enterprise_metrics_browsertest.cc
+++ b/chrome/browser/policy/enterprise_metrics_browsertest.cc
@@ -310,7 +310,7 @@ TEST_F(EnterpriseMetricsTest, TokenFetchOK) {
DeviceManagementBackendTestHelper helper(loop());
// Test token fetcher.
- UserPolicyCache cache(temp_dir().AppendASCII("FetchTokenTest"));
+ UserPolicyCache cache(temp_dir().AppendASCII("FetchTokenTest"), false);
scoped_ptr<CloudPolicyDataStore> data_store;
data_store.reset(CloudPolicyDataStore::CreateForUserPolicies());
data_store->SetupForTesting("", "fake_device_id", "fake_user_name",
@@ -465,7 +465,7 @@ TEST_F(EnterpriseMetricsTest, PolicyFetchReceiveResponse) {
TEST_F(EnterpriseMetricsTest, PolicyFetchInvalidPolicy) {
SetMetricName(kMetricPolicy);
- UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"));
+ UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"), false);
UserPolicyDiskCache::Delegate* cache_as_delegate =
implicit_cast<UserPolicyDiskCache::Delegate*>(&cache);
@@ -480,7 +480,7 @@ TEST_F(EnterpriseMetricsTest, PolicyFetchInvalidPolicy) {
TEST_F(EnterpriseMetricsTest, PolicyFetchTimestampInFuture) {
SetMetricName(kMetricPolicy);
- UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"));
+ UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"), false);
UserPolicyDiskCache::Delegate* cache_as_delegate =
implicit_cast<UserPolicyDiskCache::Delegate*>(&cache);
@@ -502,7 +502,7 @@ TEST_F(EnterpriseMetricsTest, PolicyFetchTimestampInFuture) {
TEST_F(EnterpriseMetricsTest, PolicyFetchNotModified) {
SetMetricName(kMetricPolicy);
- UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"));
+ UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"), false);
UserPolicyDiskCache::Delegate* cache_as_delegate =
implicit_cast<UserPolicyDiskCache::Delegate*>(&cache);
@@ -521,7 +521,7 @@ TEST_F(EnterpriseMetricsTest, PolicyFetchNotModified) {
TEST_F(EnterpriseMetricsTest, PolicyFetchOK) {
SetMetricName(kMetricPolicy);
- UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"));
+ UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"), false);
std::string data;
em::PolicyData policy_data;
@@ -541,7 +541,7 @@ TEST_F(EnterpriseMetricsTest, PolicyFetchOK) {
TEST_F(EnterpriseMetricsTest, PolicyFetchBadResponse) {
SetMetricName(kMetricPolicy);
- UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"));
+ UserPolicyCache cache(temp_dir().AppendASCII("UserPolicyCacheTest"), false);
PolicyNotifier notifier;
scoped_ptr<CloudPolicyDataStore> data_store;
data_store.reset(CloudPolicyDataStore::CreateForUserPolicies());

Powered by Google App Engine
This is Rietveld 408576698