fix string declarations to remove static initializer

BUG=49544
TEST=manual test to see if static initializer is still present

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

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

3 files changed, 40 insertions, 40 deletions

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 3528825..96e024f 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -126,7 +126,7 @@ const FilePath::CharType Extension::kMessagesFilename[] =
     FILE_PATH_LITERAL("messages.json");
 
 #if defined(OS_WIN)
-const char* Extension::kExtensionRegistryPath =
+const char Extension::kExtensionRegistryPath[] =
     "Software\\Google\\Chrome\\Extensions";
 #endif
 
@@ -147,22 +147,22 @@ const int Extension::kPageActionIconMaxSize = 19;
 const int Extension::kBrowserActionIconMaxSize = 19;
 
 // Explicit permissions -- permission declaration required.
-const char* Extension::kBackgroundPermission = "background";
-const char* Extension::kContextMenusPermission = "contextMenus";
-const char* Extension::kBookmarkPermission = "bookmarks";
-const char* Extension::kCookiePermission = "cookies";
-const char* Extension::kExperimentalPermission = "experimental";
-const char* Extension::kGeolocationPermission = "geolocation";
-const char* Extension::kHistoryPermission = "history";
-const char* Extension::kIdlePermission = "idle";
-const char* Extension::kNotificationPermission = "notifications";
-const char* Extension::kProxyPermission = "proxy";
-const char* Extension::kTabPermission = "tabs";
-const char* Extension::kUnlimitedStoragePermission = "unlimitedStorage";
-const char* Extension::kNativeClientPermission = "nativeClient";
-const char* Extension::kWebstorePrivatePermission = "webstorePrivate";
-
-const char* Extension::kPermissionNames[] = {
+const char Extension::kBackgroundPermission[] = "background";
+const char Extension::kContextMenusPermission[] = "contextMenus";
+const char Extension::kBookmarkPermission[] = "bookmarks";
+const char Extension::kCookiePermission[] = "cookies";
+const char Extension::kExperimentalPermission[] = "experimental";
+const char Extension::kGeolocationPermission[] = "geolocation";
+const char Extension::kHistoryPermission[] = "history";
+const char Extension::kIdlePermission[] = "idle";
+const char Extension::kNotificationPermission[] = "notifications";
+const char Extension::kProxyPermission[] = "proxy";
+const char Extension::kTabPermission[] = "tabs";
+const char Extension::kUnlimitedStoragePermission[] = "unlimitedStorage";
+const char Extension::kNativeClientPermission[] = "nativeClient";
+const char Extension::kWebstorePrivatePermission[] = "webstorePrivate";
+
+const char* const Extension::kPermissionNames[] = {
   Extension::kBackgroundPermission,
   Extension::kBookmarkPermission,
   Extension::kContextMenusPermission,
@@ -181,7 +181,7 @@ const char* Extension::kPermissionNames[] = {
 const size_t Extension::kNumPermissions =
     arraysize(Extension::kPermissionNames);
 
-const char* Extension::kHostedAppPermissionNames[] = {
+const char* const Extension::kHostedAppPermissionNames[] = {
   Extension::kBackgroundPermission,
   Extension::kGeolocationPermission,
   Extension::kNotificationPermission,
@@ -193,7 +193,7 @@ const size_t Extension::kNumHostedAppPermissions =
     arraysize(Extension::kHostedAppPermissionNames);
 
 // We purposefully don't put this into kPermissionNames.
-const char* Extension::kOldUnlimitedStoragePermission = "unlimited_storage";
+const char Extension::kOldUnlimitedStoragePermission[] = "unlimited_storage";
 
 // static
 const Extension::SimplePermissions& Extension::GetSimplePermissions() {
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 117aa33..13e019d 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -97,29 +97,29 @@ class Extension {
   // - Extension::GetSimplePermissions()
   // - Extension::IsPrivilegeIncrease()
   // - ExtensionInstallUI::GetV2Warnings()
-  static const char* kBackgroundPermission;
-  static const char* kBookmarkPermission;
-  static const char* kContextMenusPermission;
-  static const char* kCookiePermission;
-  static const char* kExperimentalPermission;
-  static const char* kGeolocationPermission;
-  static const char* kHistoryPermission;
-  static const char* kIdlePermission;
-  static const char* kNotificationPermission;
-  static const char* kProxyPermission;
-  static const char* kTabPermission;
-  static const char* kUnlimitedStoragePermission;
-  static const char* kNativeClientPermission;
-  static const char* kWebstorePrivatePermission;
-
-  static const char* kPermissionNames[];
+  static const char kBackgroundPermission[];
+  static const char kBookmarkPermission[];
+  static const char kContextMenusPermission[];
+  static const char kCookiePermission[];
+  static const char kExperimentalPermission[];
+  static const char kGeolocationPermission[];
+  static const char kHistoryPermission[];
+  static const char kIdlePermission[];
+  static const char kNotificationPermission[];
+  static const char kProxyPermission[];
+  static const char kTabPermission[];
+  static const char kUnlimitedStoragePermission[];
+  static const char kNativeClientPermission[];
+  static const char kWebstorePrivatePermission[];
+
+  static const char* const kPermissionNames[];
   static const size_t kNumPermissions;
-  static const char* kHostedAppPermissionNames[];
+  static const char* const kHostedAppPermissionNames[];
   static const size_t kNumHostedAppPermissions;
 
   // The old name for the unlimited storage permission, which is deprecated but
   // still accepted as meaning the same thing as kUnlimitedStoragePermission.
-  static const char* kOldUnlimitedStoragePermission;
+  static const char kOldUnlimitedStoragePermission[];
 
   // A "simple permission" is one that has a one-to-one mapping with a message
   // that is displayed in the install UI. This is in contrast to more complex
@@ -148,7 +148,7 @@ class Extension {
   static const FilePath::CharType kMessagesFilename[];
 
 #if defined(OS_WIN)
-  static const char* kExtensionRegistryPath;
+  static const char kExtensionRegistryPath[];
 #endif
 
   // The number of bytes in a legal id.
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
index aef1797..2c0d8ca 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -956,8 +956,8 @@ TEST(ExtensionTest, OldUnlimitedStoragePermission) {
 
   // Create a permissions list containing "unlimited_storage" and add it.
   ListValue* permissions = new ListValue();
-  const std::string old_unlimited = std::string("unlimited_storage");
-  EXPECT_EQ(old_unlimited, Extension::kOldUnlimitedStoragePermission);
+  const char* old_unlimited = "unlimited_storage";
+  EXPECT_STREQ(old_unlimited, Extension::kOldUnlimitedStoragePermission);
   permissions->Append(Value::CreateStringValue(old_unlimited));
   dictionary.Set(extension_manifest_keys::kPermissions, permissions);