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

Unified Diff: chrome/browser/ui/webui/options/preferences_browsertest.cc

Issue 14813039: Retire the Enterprise Web Store policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 7 years, 7 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/ui/webui/options/preferences_browsertest.cc
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
index 8dbc971787ae6931a8ae6a78f4c9af68b328deb8..ca15479176ded7d4b8b0ac62a82a9e54b1c00e5c 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
@@ -39,9 +39,9 @@
#endif
using testing::AllOf;
+using testing::AnyNumber;
using testing::Mock;
using testing::Property;
-using testing::AnyNumber;
using testing::Return;
using testing::_;
@@ -436,19 +436,6 @@ void PreferencesBrowserTest::UseDefaultTestPrefs(bool includeListPref) {
policy_names_.push_back(policy::key::kRestoreOnStartup);
non_default_values_.push_back(new base::FundamentalValue(4));
- // String pref.
Mattias Nissler (ping if slow) 2013/05/17 11:40:30 Bartosz, can you tell me what's the right thing to
bartfab (slow) 2013/05/17 12:59:09 How about HomepageLocation? This is a cross-platfo
- types_.push_back("String");
- pref_names_.push_back(prefs::kEnterpriseWebStoreName);
- policy_names_.push_back(policy::key::kEnterpriseWebStoreName);
- non_default_values_.push_back(new base::StringValue("Store"));
-
- // URL pref.
- types_.push_back("URL");
- pref_names_.push_back(prefs::kEnterpriseWebStoreURL);
- policy_names_.push_back(policy::key::kEnterpriseWebStoreURL);
- non_default_values_.push_back(
- new base::StringValue("http://www.google.com/"));
-
// List pref.
if (includeListPref) {
types_.push_back("List");

Powered by Google App Engine
This is Rietveld 408576698