Better constify string constants in extensions/

Review-Url: https://codereview.chromium.org/2415313002
Cr-Commit-Position: refs/heads/master@{#425392}

extensions/browser/api/cast_channel/cast_auth_util.cc

@@ -21,7 +21,7 @@ namespace api {
 namespace cast_channel {
 namespace {
 
-const char* const kParseErrorPrefix = "Failed to parse auth message: ";
+const char kParseErrorPrefix[] = "Failed to parse auth message: ";
 
 // The maximum number of days a cert can live for.
 const int kMaxSelfSignedCertLifetimeInDays = 4;

extensions/browser/api/cast_channel/logger.cc

@@ -29,7 +29,7 @@ using proto::SocketEvent;
 
 namespace {
 
-const char* kInternalNamespacePrefix = "com.google.cast";
+const char kInternalNamespacePrefix[] = "com.google.cast";
 
 proto::ChallengeReplyErrorType ChallegeReplyErrorToProto(
     AuthResult::ErrorType error_type) {

extensions/browser/api/hid/hid_apitest.cc

@@ -34,7 +34,7 @@ using testing::_;
 #if defined(OS_MACOSX)
 const uint64_t kTestDeviceIds[] = {1, 2, 3, 4, 5};
 #else
-const char* kTestDeviceIds[] = {"A", "B", "C", "D", "E"};
+const char* const kTestDeviceIds[] = {"A", "B", "C", "D", "E"};
 #endif
 
 // These report descriptors define two devices with 8-byte input, output and

extensions/browser/extension_function.cc

@@ -171,7 +171,7 @@ class UserGestureForTests {
   UserGestureForTests();
   friend struct base::DefaultSingletonTraits<UserGestureForTests>;
 
-  base::Lock lock_; // for protecting access to count_
+  base::Lock lock_;  // for protecting access to |count_|
   int count_;
 };
 
@@ -220,7 +220,7 @@ void ExtensionFunction::ResponseValueObject::SetFunctionError(
 bool ExtensionFunction::ignore_all_did_respond_for_testing_do_not_use = false;
 
 // static
-const char* ExtensionFunction::kUnknownErrorDoNotUse = "Unknown error.";
+const char ExtensionFunction::kUnknownErrorDoNotUse[] = "Unknown error.";
 
 // static
 void ExtensionFunctionDeleteTraits::Destruct(const ExtensionFunction* x) {

extensions/browser/extension_function.h

@@ -179,7 +179,7 @@ class ExtensionFunction
   // aren't already set.
   // TODO(devlin): Remove this if/when all functions are updated to return real
   // errors.
-  static const char* kUnknownErrorDoNotUse;
+  static const char kUnknownErrorDoNotUse[];
 
   // Called before Run() in order to perform a common verification check so that
   // APIs subclassing this don't have to roll their own RunSafe() variants.

extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc

@@ -34,7 +34,7 @@ using guest_view::TestGuestViewManager;
 using guest_view::TestGuestViewManagerFactory;
 
 // The test extension id is set by the key value in the manifest.
-const char* kExtensionId = "oickdpebdnfbgkcaoklfcdhjniefkcji";
+const char kExtensionId[] = "oickdpebdnfbgkcaoklfcdhjniefkcji";
 
 // Counts the number of URL requests made for a given URL.
 class URLRequestCounter {

extensions/browser/script_executor.cc

@@ -28,8 +28,8 @@ namespace extensions {
 
 namespace {
 
-const char* kRendererDestroyed = "The tab was closed.";
-const char* kFrameRemoved = "The frame was removed.";
+const char kRendererDestroyed[] = "The tab was closed.";
+const char kFrameRemoved[] = "The frame was removed.";
 
 // A handler for a single injection request. On creation this will send the
 // injection request to the renderer, and it will be destroyed after either the

extensions/browser/warning_service_unittest.cc

@@ -35,8 +35,8 @@ class MockObserver : public WarningService::Observer {
 
 typedef ExtensionsTest WarningServiceTest;
 
-const char* ext1_id = "extension1";
-const char* ext2_id = "extension2";
+const char ext1_id[] = "extension1";
+const char ext2_id[] = "extension2";
 const Warning::WarningType warning_1 = Warning::kNetworkDelay;
 const Warning::WarningType warning_2 = Warning::kNetworkConflict;
 

extensions/common/extension_api.cc

@@ -33,10 +33,7 @@ namespace extensions {
 
 namespace {
 
-const char* kChildKinds[] = {
-  "functions",
-  "events"
-};
+const char* const kChildKinds[] = {"functions", "events"};
 
 std::unique_ptr<base::DictionaryValue> LoadSchemaDictionary(
     const std::string& name,

extensions/common/manifest_handlers/shared_module_manifest_unittest.cc

@@ -11,14 +11,14 @@
 
 namespace {
 
-const char* kValidImportPath =
+const char kValidImportPath[] =
     "_modules/abcdefghijklmnopabcdefghijklmnop/foo/bar.html";
-const char* kValidImportPathID = "abcdefghijklmnopabcdefghijklmnop";
-const char* kValidImportPathRelative = "foo/bar.html";
-const char* kInvalidImportPath = "_modules/abc/foo.html";
-const char* kImportId1 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-const char* kImportId2 = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
-const char* kNoImport = "cccccccccccccccccccccccccccccccc";
+const char kValidImportPathID[] = "abcdefghijklmnopabcdefghijklmnop";
+const char kValidImportPathRelative[] = "foo/bar.html";
+const char kInvalidImportPath[] = "_modules/abc/foo.html";
+const char kImportId1[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+const char kImportId2[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
+const char kNoImport[] = "cccccccccccccccccccccccccccccccc";
 
 }  // namespace
 

extensions/common/permissions/usb_device_permission_data.cc

@@ -18,9 +18,9 @@
 
 namespace {
 
-const char* kProductIdKey = "productId";
-const char* kVendorIdKey = "vendorId";
-const char* kInterfaceIdKey = "interfaceId";
+const char kProductIdKey[] = "productId";
+const char kVendorIdKey[] = "vendorId";
+const char kInterfaceIdKey[] = "interfaceId";
 
 }  // namespace
 

extensions/common/url_pattern.cc

@@ -27,13 +27,10 @@ namespace {
 
 // TODO(aa): What about more obscure schemes like data: and javascript: ?
 // Note: keep this array in sync with kValidSchemeMasks.
-const char* kValidSchemes[] = {
-    url::kHttpScheme,
-    url::kHttpsScheme,
-    url::kFileScheme,
-    url::kFtpScheme,
-    content::kChromeUIScheme,
-    extensions::kExtensionScheme,
+const char* const kValidSchemes[] = {
+    url::kHttpScheme,         url::kHttpsScheme,
+    url::kFileScheme,         url::kFtpScheme,
+    content::kChromeUIScheme, extensions::kExtensionScheme,
     url::kFileSystemScheme,
 };
 

extensions/renderer/module_system.cc

@@ -31,10 +31,10 @@ using namespace v8_helpers;
 
 namespace {
 
-const char* kModuleSystem = "module_system";
-const char* kModuleName = "module_name";
-const char* kModuleField = "module_field";
-const char* kModulesField = "modules";
+const char kModuleSystem[] = "module_system";
+const char kModuleName[] = "module_name";
+const char kModuleField[] = "module_field";
+const char kModulesField[] = "modules";
 
 // Logs an error for the calling context in preparation for potentially
 // crashing the renderer, with some added metadata about the context:

extensions/renderer/object_backed_native_handler.cc

@@ -21,8 +21,8 @@ namespace extensions {
 
 namespace {
 // Key for the base::Bound routed function.
-const char* kHandlerFunction = "handler_function";
-const char* kFeatureName = "feature_name";
+const char kHandlerFunction[] = "handler_function";
+const char kFeatureName[] = "feature_name";
 }  // namespace
 
 ObjectBackedNativeHandler::ObjectBackedNativeHandler(ScriptContext* context)