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

Unified Diff: components/content_settings/core/browser/plugins_field_trial_unittest.cc

Issue 1252073002: Move pref names and default value into WebsiteSettingsInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@website-settings-registry-simple
Patch Set: Created 5 years, 4 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: components/content_settings/core/browser/plugins_field_trial_unittest.cc
diff --git a/components/content_settings/core/browser/plugins_field_trial_unittest.cc b/components/content_settings/core/browser/plugins_field_trial_unittest.cc
index b052d993d366773df7c15fb4140447d6aed59a0a..2511f16bee0037a7ab687f3b09622b9b7ee3d63b 100644
--- a/components/content_settings/core/browser/plugins_field_trial_unittest.cc
+++ b/components/content_settings/core/browser/plugins_field_trial_unittest.cc
@@ -9,8 +9,9 @@
#include "base/metrics/field_trial.h"
#include "base/test/mock_entropy_provider.h"
#include "components/content_settings/core/browser/content_settings_default_provider.h"
+#include "components/content_settings/core/browser/website_settings_info.h"
+#include "components/content_settings/core/browser/website_settings_registry.h"
#include "components/content_settings/core/common/content_settings.h"
-#include "components/content_settings/core/common/pref_names.h"
#include "components/plugins/common/plugins_switches.h"
#include "components/pref_registry/testing_pref_service_syncable.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -84,9 +85,13 @@ TEST_F(PluginsFieldTrialTest, NoPrefLeftBehind) {
DefaultProvider::RegisterProfilePrefs(prefs.registry());
DefaultProvider default_provider(&prefs, false);
}
+ const std::string& default_plugin_setting_pref_name =
+ WebsiteSettingsRegistry::GetInstance()
+ ->Get(CONTENT_SETTINGS_TYPE_PLUGINS)
+ ->default_value_pref_name();
EXPECT_EQ(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,
- prefs.GetInteger(prefs::kDefaultPluginsSetting));
- EXPECT_FALSE(prefs.HasPrefPath(prefs::kDefaultPluginsSetting));
+ prefs.GetInteger(default_plugin_setting_pref_name));
+ EXPECT_FALSE(prefs.HasPrefPath(default_plugin_setting_pref_name));
}
} // namespace content_settings

Powered by Google App Engine
This is Rietveld 408576698