diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 00:36:27 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 00:36:27 +0000 |
| commit | 6bf9061f137de33b450f5ae9634b8c903bf2326d (patch) | |
| tree | bf211f9108fdaafb0c065bb34d01fae62fc2e4bd /chrome/browser/extensions/updater/extension_updater_unittest.cc | |
| parent | 5c10302fc35eff459864d872d33f0091a521c98b (diff) | |
| download | chromium_src-6bf9061f137de33b450f5ae9634b8c903bf2326d.zip chromium_src-6bf9061f137de33b450f5ae9634b8c903bf2326d.tar.gz chromium_src-6bf9061f137de33b450f5ae9634b8c903bf2326d.tar.bz2 | |
Rename extension_manifest_keys namespace to extensions::manifest_keys.
Move it to extensions/common/manifest_constants.cc.
Minorly improve packaged app + manifest version 1 error message.
BUG=162530
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/22794012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/updater/extension_updater_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/updater/extension_updater_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 8b8cb2d..7fc96f4 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -41,7 +41,6 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/omaha_query_params/omaha_query_params.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" @@ -54,6 +53,7 @@ #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" #include "extensions/common/id_util.h" +#include "extensions/common/manifest_constants.h" #include "libxml/globals.h" #include "net/base/backoff_entry.h" #include "net/base/escape.h" @@ -271,12 +271,12 @@ class MockService : public TestExtensionService { Manifest::Location location) { for (int i = 1; i <= count; i++) { DictionaryValue manifest; - manifest.SetString(extension_manifest_keys::kVersion, + manifest.SetString(manifest_keys::kVersion, base::StringPrintf("%d.0.0.0", i)); - manifest.SetString(extension_manifest_keys::kName, + manifest.SetString(manifest_keys::kName, base::StringPrintf("Extension %d.%d", id, i)); if (update_url) - manifest.SetString(extension_manifest_keys::kUpdateURL, *update_url); + manifest.SetString(manifest_keys::kUpdateURL, *update_url); scoped_refptr<Extension> e = prefs_->AddExtensionWithManifest(manifest, location); ASSERT_TRUE(e.get() != NULL); |