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

Unified Diff: chrome/browser/extensions/test_extension_prefs.cc

Issue 22794012: Rename extension_manifest_keys namespace to extensions::manifest_keys. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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: chrome/browser/extensions/test_extension_prefs.cc
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index 018ff42c7e823922dfda7debe39c677ed41ac74a..c53f1362746bfe5128a26e778fcc7641d4533149 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -22,9 +22,9 @@
#include "chrome/browser/prefs/pref_service_mock_builder.h"
#include "chrome/browser/prefs/pref_service_syncable.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
#include "components/user_prefs/pref_registry_syncable.h"
#include "content/public/browser/browser_thread.h"
+#include "extensions/common/manifest_constants.h"
#include "sync/api/string_ordinal.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -122,18 +122,17 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
scoped_refptr<Extension> TestExtensionPrefs::AddExtension(std::string name) {
DictionaryValue dictionary;
- dictionary.SetString(extension_manifest_keys::kName, name);
- dictionary.SetString(extension_manifest_keys::kVersion, "0.1");
+ dictionary.SetString(manifest_keys::kName, name);
+ dictionary.SetString(manifest_keys::kVersion, "0.1");
return AddExtensionWithManifest(dictionary, Manifest::INTERNAL);
}
scoped_refptr<Extension> TestExtensionPrefs::AddApp(std::string name) {
DictionaryValue dictionary;
- dictionary.SetString(extension_manifest_keys::kName, name);
- dictionary.SetString(extension_manifest_keys::kVersion, "0.1");
- dictionary.SetString(extension_manifest_keys::kApp, "true");
- dictionary.SetString(extension_manifest_keys::kLaunchWebURL,
- "http://example.com");
+ dictionary.SetString(manifest_keys::kName, name);
+ dictionary.SetString(manifest_keys::kVersion, "0.1");
+ dictionary.SetString(manifest_keys::kApp, "true");
+ dictionary.SetString(manifest_keys::kLaunchWebURL, "http://example.com");
return AddExtensionWithManifest(dictionary, Manifest::INTERNAL);
}
@@ -149,7 +148,7 @@ scoped_refptr<Extension> TestExtensionPrefs::AddExtensionWithManifestAndFlags(
Manifest::Location location,
int extra_flags) {
std::string name;
- EXPECT_TRUE(manifest.GetString(extension_manifest_keys::kName, &name));
+ EXPECT_TRUE(manifest.GetString(manifest_keys::kName, &name));
base::FilePath path = extensions_dir_.AppendASCII(name);
std::string errors;
scoped_refptr<Extension> extension = Extension::Create(

Powered by Google App Engine
This is Rietveld 408576698