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

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

Issue 6793045: Change text of DNS prefetch option to Network prediction option. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another bad merge fix Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "chrome/browser/policy/configuration_policy_pref_store.h" 7 #include "chrome/browser/policy/configuration_policy_pref_store.h"
8 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 8 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
9 #include "chrome/browser/prefs/proxy_config_dictionary.h" 9 #include "chrome/browser/prefs/proxy_config_dictionary.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 ConfigurationPolicyPrefStoreBooleanTestInstance, 158 ConfigurationPolicyPrefStoreBooleanTestInstance,
159 ConfigurationPolicyPrefStoreBooleanTest, 159 ConfigurationPolicyPrefStoreBooleanTest,
160 testing::Values( 160 testing::Values(
161 TypeAndName(kPolicyHomepageIsNewTabPage, 161 TypeAndName(kPolicyHomepageIsNewTabPage,
162 prefs::kHomePageIsNewTabPage), 162 prefs::kHomePageIsNewTabPage),
163 TypeAndName(kPolicyAlternateErrorPagesEnabled, 163 TypeAndName(kPolicyAlternateErrorPagesEnabled,
164 prefs::kAlternateErrorPagesEnabled), 164 prefs::kAlternateErrorPagesEnabled),
165 TypeAndName(kPolicySearchSuggestEnabled, 165 TypeAndName(kPolicySearchSuggestEnabled,
166 prefs::kSearchSuggestEnabled), 166 prefs::kSearchSuggestEnabled),
167 TypeAndName(kPolicyDnsPrefetchingEnabled, 167 TypeAndName(kPolicyDnsPrefetchingEnabled,
168 prefs::kDnsPrefetchingEnabled), 168 prefs::kNetworkPredictionEnabled),
169 TypeAndName(kPolicyDisableSpdy, 169 TypeAndName(kPolicyDisableSpdy,
170 prefs::kDisableSpdy), 170 prefs::kDisableSpdy),
171 TypeAndName(kPolicySafeBrowsingEnabled, 171 TypeAndName(kPolicySafeBrowsingEnabled,
172 prefs::kSafeBrowsingEnabled), 172 prefs::kSafeBrowsingEnabled),
173 TypeAndName(kPolicyMetricsReportingEnabled, 173 TypeAndName(kPolicyMetricsReportingEnabled,
174 prefs::kMetricsReportingEnabled), 174 prefs::kMetricsReportingEnabled),
175 TypeAndName(kPolicyPasswordManagerEnabled, 175 TypeAndName(kPolicyPasswordManagerEnabled,
176 prefs::kPasswordManagerEnabled), 176 prefs::kPasswordManagerEnabled),
177 TypeAndName(kPolicyPasswordManagerAllowShowPasswords, 177 TypeAndName(kPolicyPasswordManagerAllowShowPasswords,
178 prefs::kPasswordManagerAllowShowPasswords), 178 prefs::kPasswordManagerAllowShowPasswords),
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 737
738 provider_.SetInitializationComplete(true); 738 provider_.SetInitializationComplete(true);
739 EXPECT_FALSE(store_->IsInitializationComplete()); 739 EXPECT_FALSE(store_->IsInitializationComplete());
740 740
741 store_->OnUpdatePolicy(); 741 store_->OnUpdatePolicy();
742 Mock::VerifyAndClearExpectations(&observer_); 742 Mock::VerifyAndClearExpectations(&observer_);
743 EXPECT_TRUE(store_->IsInitializationComplete()); 743 EXPECT_TRUE(store_->IsInitializationComplete());
744 } 744 }
745 745
746 } // namespace policy 746 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698