Refactor extension constants to improve readability, debugging, and to make it easier to add new constants.

Review URL: http://codereview.chromium.org/155407

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20483 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 8 deletions

diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index 05686d4..55acce7 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/net/test_url_fetcher_factory.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -116,8 +117,10 @@ void CreateTestExtensions(int count, ExtensionList *list) {
   for (int i = 1; i <= count; i++) {
     DictionaryValue input;
     Extension* e = new Extension();
-    input.SetString(Extension::kVersionKey, StringPrintf("%d.0.0.0", i));
-    input.SetString(Extension::kNameKey, StringPrintf("Extension %d", i));
+    input.SetString(extension_manifest_keys::kVersion,
+                    StringPrintf("%d.0.0.0", i));
+    input.SetString(extension_manifest_keys::kName,
+                    StringPrintf("Extension %d", i));
     std::string error;
     EXPECT_TRUE(e->InitFromValue(input, false, &error));
     list->push_back(e);
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 57247cb..27031d8 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -32,6 +32,7 @@
 #include "chrome/browser/utility_process_host.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "chrome/common/extensions/extension_unpacker.h"
 #include "chrome/common/json_value_serializer.h"
@@ -164,7 +165,7 @@ class ExtensionsServiceBackend::UnpackerClient
     // The const_cast is hacky, but seems like the right thing here, rather than
     // making a full copy just to make this change.
     const_cast<DictionaryValue*>(&manifest)->SetString(
-        Extension::kPublicKeyKey, public_key_);
+        extension_manifest_keys::kPublicKey, public_key_);
 
     // The extension was unpacked to the temp dir inside our unpacking dir.
     FilePath extension_dir = temp_extension_path_.DirName().AppendASCII(
@@ -682,7 +683,7 @@ DictionaryValue* ExtensionsServiceBackend::ReadManifest(FilePath manifest_path,
     return NULL;
 
   if (!root->IsType(Value::TYPE_DICTIONARY)) {
-    *error = Extension::kInvalidManifestError;
+    *error = extension_manifest_errors::kInvalidManifest;
     return NULL;
   }
 
@@ -696,7 +697,8 @@ Extension* ExtensionsServiceBackend::LoadExtension(
   FilePath manifest_path =
       extension_path.AppendASCII(Extension::kManifestFilename);
   if (!file_util::PathExists(manifest_path)) {
-    ReportExtensionLoadError(extension_path, Extension::kInvalidManifestError);
+    ReportExtensionLoadError(extension_path,
+        extension_manifest_errors::kInvalidManifest);
     return NULL;
   }
 
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index ac668e1f..dd77d47 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/extensions/external_extension_provider.h"
 #include "chrome/browser/extensions/external_pref_extension_provider.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -604,15 +605,15 @@ TEST_F(ExtensionsServiceTest, LoadAllExtensionsFromDirectoryFail) {
 
   EXPECT_TRUE(MatchPattern(GetErrors()[1],
       std::string("Could not load extension from '*'. ") +
-      Extension::kInvalidManifestError)) << GetErrors()[1];
+      extension_manifest_errors::kInvalidManifest)) << GetErrors()[1];
 
   EXPECT_TRUE(MatchPattern(GetErrors()[2],
       std::string("Could not load extension from '*'. ") +
-      Extension::kMissingFileError)) << GetErrors()[2];
+      extension_manifest_errors::kMissingFile)) << GetErrors()[2];
 
   EXPECT_TRUE(MatchPattern(GetErrors()[3],
       std::string("Could not load extension from '*'. ") +
-      Extension::kInvalidManifestError)) << GetErrors()[3];
+      extension_manifest_errors::kInvalidManifest)) << GetErrors()[3];
 };
 
 // Test that partially deleted extensions are cleaned up during startup