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

Unified Diff: chrome/browser/extensions/api/management/management_browsertest.cc

Issue 140343002: extensions: Relocate pref name constants. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort constants and merge Created 6 years, 11 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/extensions/api/management/management_browsertest.cc
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
index c98dcd34fe6ffd4398f4a24a7b639c0323fc0665..ce3bf76f757c41ceb79b55c362828b64f7d1f316 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -26,6 +26,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/test/browser_test_utils.h"
#include "content/test/net/url_request_prepackaged_interceptor.h"
+#include "extensions/browser/pref_names.h"
#include "net/url_request/url_fetcher.h"
using extensions::Extension;
@@ -496,12 +497,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
PrefService* prefs = browser()->profile()->GetPrefs();
const base::DictionaryValue* forcelist =
- prefs->GetDictionary(prefs::kExtensionInstallForceList);
+ prefs->GetDictionary(extensions::pref_names::kInstallForceList);
ASSERT_TRUE(forcelist->empty()) << kForceInstallNotEmptyHelp;
{
// Set the policy as a user preference and fire notification observers.
- DictionaryPrefUpdate pref_update(prefs, prefs::kExtensionInstallForceList);
+ DictionaryPrefUpdate pref_update(prefs,
+ extensions::pref_names::kInstallForceList);
base::DictionaryValue* forcelist = pref_update.Get();
extensions::ExternalPolicyLoader::AddExtension(
forcelist, kExtensionId, "http://localhost/autoupdate/manifest");
@@ -532,7 +534,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
EXPECT_EQ(0u, service->disabled_extensions()->size());
// Check that emptying the list triggers uninstall.
- prefs->ClearPref(prefs::kExtensionInstallForceList);
+ prefs->ClearPref(extensions::pref_names::kInstallForceList);
EXPECT_EQ(size_before + 1, service->extensions()->size());
EXPECT_FALSE(service->GetExtensionById(kExtensionId, true));
}
@@ -568,7 +570,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
// Check that the policy is initially empty.
PrefService* prefs = browser()->profile()->GetPrefs();
const base::DictionaryValue* forcelist =
- prefs->GetDictionary(prefs::kExtensionInstallForceList);
+ prefs->GetDictionary(extensions::pref_names::kInstallForceList);
ASSERT_TRUE(forcelist->empty()) << kForceInstallNotEmptyHelp;
// User install of the extension.
@@ -581,7 +583,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
// Setup the force install policy. It should override the location.
{
- DictionaryPrefUpdate pref_update(prefs, prefs::kExtensionInstallForceList);
+ DictionaryPrefUpdate pref_update(prefs,
+ extensions::pref_names::kInstallForceList);
extensions::ExternalPolicyLoader::AddExtension(
pref_update.Get(), kExtensionId,
"http://localhost/autoupdate/manifest");
@@ -597,7 +600,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
// TODO(joaodasilva): it would be nicer if the extension was kept instead,
// and reverted location to INTERNAL or whatever it was before the policy
// was applied.
- prefs->ClearPref(prefs::kExtensionInstallForceList);
+ prefs->ClearPref(extensions::pref_names::kInstallForceList);
ASSERT_EQ(size_before, service->extensions()->size());
extension = service->GetExtensionById(kExtensionId, true);
EXPECT_FALSE(extension);
@@ -620,7 +623,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
// Install the policy again. It should overwrite the extension's location,
// and force enable it too.
{
- DictionaryPrefUpdate pref_update(prefs, prefs::kExtensionInstallForceList);
+ DictionaryPrefUpdate pref_update(prefs,
+ extensions::pref_names::kInstallForceList);
base::DictionaryValue* forcelist = pref_update.Get();
extensions::ExternalPolicyLoader::AddExtension(
forcelist, kExtensionId, "http://localhost/autoupdate/manifest");

Powered by Google App Engine
This is Rietveld 408576698