diff --git a/extensions/browser/api/cast_channel/cast_auth_util.cc b/extensions/browser/api/cast_channel/cast_auth_util.cc index 0e5c38844cbe1e..c6067bdfa334ef 100644 --- a/extensions/browser/api/cast_channel/cast_auth_util.cc +++ b/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; diff --git a/extensions/browser/api/cast_channel/logger.cc b/extensions/browser/api/cast_channel/logger.cc index a0d92f3ada7109..46cd10283a6ea5 100644 --- a/extensions/browser/api/cast_channel/logger.cc +++ b/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) { diff --git a/extensions/browser/api/hid/hid_apitest.cc b/extensions/browser/api/hid/hid_apitest.cc index e583f5fa6ed50e..f4e6eb4179b78e 100644 --- a/extensions/browser/api/hid/hid_apitest.cc +++ b/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 diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc index 5995ad1a3f2cce..042169340f22a4 100644 --- a/extensions/browser/extension_function.cc +++ b/extensions/browser/extension_function.cc @@ -171,7 +171,7 @@ class UserGestureForTests { UserGestureForTests(); friend struct base::DefaultSingletonTraits; - 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) { diff --git a/extensions/browser/extension_function.h b/extensions/browser/extension_function.h index dee9a4fe16ea0e..a547b0e101ae34 100644 --- a/extensions/browser/extension_function.h +++ b/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. diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc index 7819c4c5a340d4..7014700857c15d 100644 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc +++ b/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 { diff --git a/extensions/browser/script_executor.cc b/extensions/browser/script_executor.cc index 84fc2c394694cc..105889c3121ab9 100644 --- a/extensions/browser/script_executor.cc +++ b/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 diff --git a/extensions/browser/warning_service_unittest.cc b/extensions/browser/warning_service_unittest.cc index abe7851a35c964..83a3ea0bed8610 100644 --- a/extensions/browser/warning_service_unittest.cc +++ b/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; diff --git a/extensions/common/extension_api.cc b/extensions/common/extension_api.cc index 9a0801e018f757..e420c5fb117964 100644 --- a/extensions/common/extension_api.cc +++ b/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 LoadSchemaDictionary( const std::string& name, diff --git a/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc b/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc index 63ff88e381610b..8138ee155a1c70 100644 --- a/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc +++ b/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 diff --git a/extensions/common/permissions/usb_device_permission_data.cc b/extensions/common/permissions/usb_device_permission_data.cc index eef44a686922bd..c23b0b21c81b39 100644 --- a/extensions/common/permissions/usb_device_permission_data.cc +++ b/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 diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc index a74c864c8e0e39..7313e125a81ec4 100644 --- a/extensions/common/url_pattern.cc +++ b/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, }; diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc index 55c7bab3f63e5c..b814350e1c9ddd 100644 --- a/extensions/renderer/module_system.cc +++ b/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: diff --git a/extensions/renderer/object_backed_native_handler.cc b/extensions/renderer/object_backed_native_handler.cc index e1aa94053e1777..7346e392c38241 100644 --- a/extensions/renderer/object_backed_native_handler.cc +++ b/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)