Cleanup: Better constify some strings in chrome/browser/{chromeos,extensions}.

Fix lint errors along the way.

Review URL: https://codereview.chromium.org/635573005

Cr-Commit-Position: refs/heads/master@{#302318}

82 files changed, 193 insertions, 191 deletions

diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
index aeec016..0f5f54c 100644
--- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
@@ -121,7 +121,6 @@ class SearchMetadataTest : public testing::Test {
     entry.mutable_file_specific_info()->set_content_mime_type(
         drive::util::kGoogleDocumentMimeType);
     EXPECT_EQ(FILE_ERROR_OK, resource_metadata_->AddEntry(entry, &local_id));
-
   }
 
   ResourceEntry GetFileEntry(const std::string& name,
@@ -382,7 +381,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_ExcludeDirectory) {
 
 // "drive", "drive/root", "drive/other" should be excluded.
 TEST_F(SearchMetadataTest, SearchMetadata_ExcludeSpecialDirectories) {
-  const char* kQueries[] = { "drive", "root", "other" };
+  const char* const kQueries[] = { "drive", "root", "other" };
   for (size_t i = 0; i < arraysize(kQueries); ++i) {
     FileError error = FILE_ERROR_FAILED;
     scoped_ptr<MetadataSearchResultVector> result;
diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc
index 7055356..71c3874 100644
--- a/chrome/browser/chromeos/extensions/default_app_order.cc
+++ b/chrome/browser/chromeos/extensions/default_app_order.cc
@@ -31,7 +31,7 @@ const char kDefaultAttr[] = "default";
 const char kNameAttr[] = "name";
 const char kImportDefaultOrderAttr[] = "import_default_order";
 
-const char* kDefaultAppOrder[] = {
+const char* const kDefaultAppOrder[] = {
     extension_misc::kChromeAppId,
     extensions::kWebStoreAppId,
     extension_misc::kGoogleSearchAppId,
diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
index 00bf2b9..88971cbd8 100644
--- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
+++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
@@ -18,7 +18,7 @@ namespace chromeos {
 namespace {
 
 // Apps/extensions explicitly whitelisted for use in public sessions.
-const char* kPublicSessionWhitelist[] = {
+const char* const kPublicSessionWhitelist[] = {
     // Public sessions in general:
     "cbkkbcmdlboombapidmoeolnmdacpkch",  // Chrome RDP
     "djflhoibgkdhkhhcedjiklpkjnoahfmg",  // User Agent Switcher
diff --git a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
index 1e100c90..11f4a06 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
@@ -16,7 +16,7 @@ namespace wallpaper_api_util {
 namespace {
 
 // Keeps in sync (same order) with WallpaperLayout enum in header file.
-const char* kWallpaperLayoutArrays[] = {
+const char* const kWallpaperLayoutArrays[] = {
   "CENTER",
   "CENTER_CROPPED",
   "STRETCH",
@@ -25,7 +25,7 @@ const char* kWallpaperLayoutArrays[] = {
 
 const int kWallpaperLayoutCount = arraysize(kWallpaperLayoutArrays);
 
-} // namespace
+}  // namespace
 
 const char kCancelWallpaperMessage[] = "Set wallpaper was canceled.";
 
diff --git a/chrome/browser/chromeos/extensions/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/extensions/wallpaper_manager_browsertest.cc
index cfbe2d8..e7c15d6 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_manager_browsertest.cc
@@ -18,7 +18,7 @@ using extensions::Extension;
 using extensions::ExtensionRegistry;
 
 namespace {
-const char* kWallpaperManagerExtensionID = "obklkkbkpaoaejdabbfldmcfplpdgolj";
+const char kWallpaperManagerExtensionID[] = "obklkkbkpaoaejdabbfldmcfplpdgolj";
 }  // namespace
 
 class WallpaperManagerBrowserTest : public extensions::PlatformAppBrowserTest {
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index 5e7a9ea..943b2f9 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -18,14 +18,11 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 
-//#include "base/compiler_specific.h"
-//#include "base/logging.h"
-//#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 namespace chromeos {
 namespace {
 
-const char* kTestAccount1 = "user1@test.com";
-const char* kTestAccount2 = "user2@test.com";
+const char kTestAccount1[] = "user1@test.com";
+const char kTestAccount2[] = "user2@test.com";
 
 class WallpaperPrivateApiUnittest : public ash::test::AshTestBase {
  public:
diff --git a/chrome/browser/chromeos/file_manager/file_tasks.cc b/chrome/browser/chromeos/file_manager/file_tasks.cc
index 5187372..8474b6e 100644
--- a/chrome/browser/chromeos/file_manager/file_tasks.cc
+++ b/chrome/browser/chromeos/file_manager/file_tasks.cc
@@ -112,7 +112,7 @@ bool IsFallbackFileHandler(const file_tasks::TaskDescriptor& task) {
       task.task_type != file_tasks::TASK_TYPE_FILE_HANDLER)
     return false;
 
-  const char* kBuiltInApps[] = {
+  const char* const kBuiltInApps[] = {
     kFileManagerAppId,
     kVideoPlayerAppId,
     kGalleryAppId,
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc
index 6a1dfed..ee15c7c 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine.cc
@@ -39,12 +39,13 @@
 #endif
 
 namespace chromeos {
-const char* kErrorNotActive = "IME is not active";
-const char* kErrorWrongContext = "Context is not active";
-const char* kCandidateNotFound = "Candidate not found";
 
 namespace {
 
+const char kErrorNotActive[] = "IME is not active";
+const char kErrorWrongContext[] = "Context is not active";
+const char kCandidateNotFound[] = "Candidate not found";
+
 // Notifies InputContextHandler that the composition is changed.
 void UpdateComposition(const CompositionText& composition_text,
                        uint32 cursor_pos,
@@ -620,7 +621,7 @@ void InputMethodEngine::ProcessKeyEvent(
     const ui::KeyEvent& key_event,
     const KeyEventDoneCallback& callback) {
 
-  KeyEventDoneCallback *handler = new KeyEventDoneCallback();
+  KeyEventDoneCallback* handler = new KeyEventDoneCallback();
   *handler = callback;
 
   KeyboardEvent ext_event;
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index 9b4ef5b..5368282 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -72,7 +72,7 @@ std::string DeriveCommandLine(const GURL& start_url,
                               CommandLine* command_line) {
   DCHECK_NE(&base_command_line, command_line);
 
-  static const char* kForwardSwitches[] = {
+  static const char* const kForwardSwitches[] = {
     ::switches::kDisableAccelerated2dCanvas,
     ::switches::kDisableAcceleratedVideoDecode,
     ::switches::kDisableDelegatedRenderer,
diff --git a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc
index 69c60b6..9ba1947 100644
--- a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc
+++ b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc
@@ -35,10 +35,10 @@ namespace chromeos {
 namespace {
 
 // OOBE constants.
-const char* kLocaleSelect = "language-select";
-const char* kKeyboardSelect = "keyboard-select";
+const char kLocaleSelect[] = "language-select";
+const char kKeyboardSelect[] = "keyboard-select";
 
-const char* kUSLayout = "xkb:us::eng";
+const char kUSLayout[] = "xkb:us::eng";
 
 }
 
diff --git a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc
index ee1ce29..b819f7e 100644
--- a/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc
+++ b/chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc
@@ -29,7 +29,7 @@ const int kProxySettingsDialogReasonableHeight = 525;
 const float kProxySettingsDialogReasonableWidthRatio = 0.4f;
 const float kProxySettingsDialogReasonableHeightRatio = 0.4f;
 
-const char* kProxySettingsURLParam = "?network=%s";
+const char kProxySettingsURLParam[] = "?network=%s";
 
 int CalculateSize(int screen_size, int min_comfortable, float desired_ratio) {
   int desired_size = static_cast<int>(desired_ratio * screen_size);
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
index 002f353..d21d17f 100644
--- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
@@ -25,9 +25,9 @@ using namespace testing;
 
 namespace {
 
-const char* kTestUsers[] = {"test-user1@gmail.com",
-                            "test-user2@gmail.com",
-                            "test-user3@gmail.com"};
+const char* const kTestUsers[] = {"test-user1@gmail.com",
+                                  "test-user2@gmail.com",
+                                  "test-user3@gmail.com"};
 
 }  // anonymous namespace
 
diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
index 2751912..64f4c6c 100644
--- a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
+++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
@@ -30,7 +30,7 @@ namespace chromeos {
 
 namespace {
 
-const char* kUsers[] = {"a@gmail.com", "b@gmail.com" };
+const char* const kUsers[] = {"a@gmail.com", "b@gmail.com" };
 
 struct BehaviorTestCase {
   const char* primary;
@@ -212,12 +212,13 @@ class MultiProfileUserControllerTest
 
   int user_not_allowed_count_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(MultiProfileUserControllerTest);
 };
 
 // Tests that everyone is allowed before a session starts.
 TEST_F(MultiProfileUserControllerTest, AllAllowedBeforeLogin) {
-  const char* kTestCases[] = {
+  const char* const kTestCases[] = {
     MultiProfileUserController::kBehaviorUnrestricted,
     MultiProfileUserController::kBehaviorPrimaryOnly,
     MultiProfileUserController::kBehaviorNotAllowed,
@@ -246,7 +247,7 @@ TEST_F(MultiProfileUserControllerTest, InvalidCacheBecomesDefault) {
 TEST_F(MultiProfileUserControllerTest, CachedBehaviorUpdate) {
   LoginUser(0);
 
-  const char* kTestCases[] = {
+  const char* const kTestCases[] = {
     MultiProfileUserController::kBehaviorUnrestricted,
     MultiProfileUserController::kBehaviorPrimaryOnly,
     MultiProfileUserController::kBehaviorNotAllowed,
diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc
index edd2857..5298bb2 100644
--- a/chrome/browser/chromeos/login/version_info_updater.cc
+++ b/chrome/browser/chromeos/login/version_info_updater.cc
@@ -26,7 +26,7 @@ namespace chromeos {
 
 namespace {
 
-const char* kReportingFlags[] = {
+const char* const kReportingFlags[] = {
   chromeos::kReportDeviceVersionInfo,
   chromeos::kReportDeviceActivityTimes,
   chromeos::kReportDeviceBootMode,
diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.cc b/chrome/browser/chromeos/memory/oom_priority_manager.cc
index cc14278..823207f 100644
--- a/chrome/browser/chromeos/memory/oom_priority_manager.cc
+++ b/chrome/browser/chromeos/memory/oom_priority_manager.cc
@@ -272,7 +272,7 @@ void OomPriorityManager::LogMemoryAndDiscardTab() {
 bool OomPriorityManager::IsReloadableUI(const GURL& url) {
   // There are many chrome:// UI URLs, but only look for the ones that users
   // are likely to have open. Most of the benefit is the from NTP URL.
-  const char* kReloadableUrlPrefixes[] = {
+  const char* const kReloadableUrlPrefixes[] = {
       chrome::kChromeUIDownloadsURL,
       chrome::kChromeUIHistoryURL,
       chrome::kChromeUINewTabURL,
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
index e749594..b34cf1e 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
@@ -31,11 +31,11 @@ namespace chromeos {
 
 namespace {
 
-const char* kNotificationId =
+const char* const kNotificationId =
     NetworkPortalNotificationController::kNotificationId;
-const char* kNotificationMetric =
+const char* const kNotificationMetric =
     NetworkPortalNotificationController::kNotificationMetric;
-const char* kUserActionMetric =
+const char* const kUserActionMetric =
     NetworkPortalNotificationController::kUserActionMetric;
 
 const char kTestUser[] = "test-user@gmail.com";
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
index f692f13..235a4e6 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
@@ -528,7 +528,7 @@ TEST_F(NetworkPortalDetectorImplTest, PortalDetectionTimeout) {
 TEST_F(NetworkPortalDetectorImplTest, PortalDetectionRetryAfter) {
   ASSERT_TRUE(is_state_idle());
 
-  const char* retry_after = "HTTP/1.1 503 OK\nRetry-After: 101\n\n";
+  const char retry_after[] = "HTTP/1.1 503 OK\nRetry-After: 101\n\n";
 
   ASSERT_TRUE(is_state_idle());
   ASSERT_EQ(0, no_response_result_count());
@@ -549,7 +549,7 @@ TEST_F(NetworkPortalDetectorImplTest, PortalDetectionRetryAfter) {
 TEST_F(NetworkPortalDetectorImplTest, PortalDetectorRetryAfterIsSmall) {
   ASSERT_TRUE(is_state_idle());
 
-  const char* retry_after = "HTTP/1.1 503 OK\nRetry-After: 1\n\n";
+  const char retry_after[] = "HTTP/1.1 503 OK\nRetry-After: 1\n\n";
 
   ASSERT_TRUE(is_state_idle());
   ASSERT_EQ(0, no_response_result_count());
@@ -570,7 +570,7 @@ TEST_F(NetworkPortalDetectorImplTest, FirstAttemptFailed) {
   ASSERT_TRUE(is_state_idle());
 
   set_delay_till_next_attempt(base::TimeDelta());
-  const char* retry_after = "HTTP/1.1 503 OK\nRetry-After: 0\n\n";
+  const char retry_after[] = "HTTP/1.1 503 OK\nRetry-After: 0\n\n";
 
   ASSERT_TRUE(is_state_idle());
   ASSERT_EQ(0, no_response_result_count());
@@ -601,7 +601,7 @@ TEST_F(NetworkPortalDetectorImplTest, AllAttemptsFailed) {
   ASSERT_TRUE(is_state_idle());
 
   set_delay_till_next_attempt(base::TimeDelta());
-  const char* retry_after = "HTTP/1.1 503 OK\nRetry-After: 0\n\n";
+  const char retry_after[] = "HTTP/1.1 503 OK\nRetry-After: 0\n\n";
 
   ASSERT_TRUE(is_state_idle());
   ASSERT_EQ(0, no_response_result_count());
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc
index ee1064e..87ad5bd 100644
--- a/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc
+++ b/chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc
@@ -16,7 +16,7 @@ namespace chromeos {
 
 namespace {
 
-const char* kNotificationId =
+const char* const kNotificationId =
     NetworkPortalNotificationController::kNotificationId;
 
 bool HasNotification() {
diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
index f1e0731..545c87e 100644
--- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
@@ -13,8 +13,8 @@ using content::InterstitialPage;
 using content::WebContents;
 using content::WebContentsTester;
 
-static const char* kURL1 = "http://www.google.com/";
-static const char* kURL2 = "http://www.gmail.com/";
+static const char kURL1[] = "http://www.google.com/";
+static const char kURL2[] = "http://www.gmail.com/";
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/policy/consumer_management_service.cc b/chrome/browser/chromeos/policy/consumer_management_service.cc
index 9d0d75b..6c05ac5 100644
--- a/chrome/browser/chromeos/policy/consumer_management_service.cc
+++ b/chrome/browser/chromeos/policy/consumer_management_service.cc
@@ -23,7 +23,7 @@ namespace {
 const char kAttributeOwnerId[] = "consumer_management.owner_id";
 
 // The string of Status enum.
-const char* kStatusString[] = {
+const char* const kStatusString[] = {
   "StatusUnknown",
   "StatusEnrolled",
   "StatusEnrolling",
diff --git a/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc b/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc
index 08524be..ae11f82 100644
--- a/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc
@@ -31,8 +31,8 @@ using testing::_;
 namespace em = enterprise_management;
 
 namespace {
-const char* kAttributeOwnerId = "consumer_management.owner_id";
-const char* kTestOwner = "test@chromium.org.test";
+const char kAttributeOwnerId[] = "consumer_management.owner_id";
+const char kTestOwner[] = "test@chromium.org.test";
 }
 
 namespace policy {
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
index 4814dcd..177213f 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
@@ -55,7 +55,7 @@ const char kSharkRequisition[] = "shark";
 //
 // TODO(mnissler): Move serial_number back to the top once the server side uses
 // the correct serial number.
-const char* kMachineInfoSerialNumberKeys[] = {
+const char* const kMachineInfoSerialNumberKeys[] = {
   "Product_S/N",    // Lumpy/Alex devices
   "serial_number",  // VPD v2+ devices
   "Product_SN",     // Mario
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index 5922fee..0a2cd60 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -152,7 +152,7 @@ const char kAccountId1[] = "dla1@example.com";
 const char kAccountId2[] = "dla2@example.com";
 const char kDisplayName1[] = "display name 1";
 const char kDisplayName2[] = "display name 2";
-const char* kStartupURLs[] = {
+const char* const kStartupURLs[] = {
   "chrome://policy",
   "chrome://about",
 };
@@ -179,19 +179,19 @@ const char kPackagedAppCRXPath[] = "extensions/platform_apps/app_window_2.crx";
 const char kExternalData[] = "External data";
 const char kExternalDataURL[] = "http://localhost/external_data";
 
-const char* kSingleRecommendedLocale[] = {
+const char* const kSingleRecommendedLocale[] = {
   "el",
 };
-const char* kRecommendedLocales1[] = {
+const char* const kRecommendedLocales1[] = {
   "pl",
   "et",
   "en-US",
 };
-const char* kRecommendedLocales2[] = {
+const char* const kRecommendedLocales2[] = {
   "fr",
   "nl",
 };
-const char* kInvalidRecommendedLocale[] = {
+const char* const kInvalidRecommendedLocale[] = {
   "xx",
 };
 const char kPublicSessionLocale[] = "de";
@@ -563,7 +563,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
         kAccountId1, device_local_account_policy_.GetBlob());
   }
 
-  void SetRecommendedLocales(const char* recommended_locales[],
+  void SetRecommendedLocales(const char* const recommended_locales[],
                              size_t array_size) {
     em::StringListPolicyProto* session_locales_proto =
         device_local_account_policy_.payload().mutable_sessionlocales();
diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
index 8ce3492..e66d075 100644
--- a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
+++ b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc
@@ -121,7 +121,7 @@ void EnterpriseInstallAttributes::ReadAttributesIfReady(
         !cryptohome_util::InstallAttributesIsFirstInstall()) {
       device_locked_ = true;
 
-      static const char* kEnterpriseAttributes[] = {
+      static const char* const kEnterpriseAttributes[] = {
         kAttrEnterpriseDeviceId,
         kAttrEnterpriseDomain,
         kAttrEnterpriseMode,
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
index e66780a..0953f6a 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
@@ -37,7 +37,7 @@ namespace {
 
 const char kAccountId[] = "dla1@example.com";
 const char kAccountPassword[] = "letmein";
-const char* kStartupURLs[] = {"chrome://policy", "chrome://about"};
+const char* const kStartupURLs[] = {"chrome://policy", "chrome://about"};
 const char kTestAuthCode[] = "fake-auth-code";
 const char kTestGaiaUberToken[] = "fake-uber-token";
 const char kTestAuthLoginAccessToken[] = "fake-access-token";
diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_browsertest.cc
index bf12c33..72d0d75 100644
--- a/chrome/browser/chromeos/preferences_browsertest.cc
+++ b/chrome/browser/chromeos/preferences_browsertest.cc
@@ -32,7 +32,8 @@ namespace chromeos {
 
 namespace {
 
-const char* kTestUsers[] = {"test-user1@gmail.com", "test-user2@gmail.com"};
+const char* const kTestUsers[] = {"test-user1@gmail.com",
+                                  "test-user2@gmail.com"};
 
 }  // namespace
 
diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
index 58f52e1..ccdc84e 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
@@ -204,7 +204,7 @@ const struct TestParams {
   },
 };  // tests
 
-const char* kUserProfilePath = "user_profile";
+const char kUserProfilePath[] = "user_profile";
 
 }  // namespace
 
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index a6a4ae1..a3dcfe9 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -37,7 +37,7 @@ namespace chromeos {
 namespace {
 
 // List of settings handled by the DeviceSettingsProvider.
-const char* kKnownSettings[] = {
+const char* const kKnownSettings[] = {
   kAccountsPrefAllowGuest,
   kAccountsPrefAllowNewUser,
   kAccountsPrefDeviceLocalAccounts,
@@ -462,7 +462,7 @@ DeviceSettingsProvider::~DeviceSettingsProvider() {
 
 // static
 bool DeviceSettingsProvider::IsDeviceSetting(const std::string& name) {
-  const char** end = kKnownSettings + arraysize(kKnownSettings);
+  const char* const* end = kKnownSettings + arraysize(kKnownSettings);
   return std::find(kKnownSettings, end, name) != end;
 }
 
diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc
index d282170..eea16bd 100644
--- a/chrome/browser/extensions/active_script_controller_browsertest.cc
+++ b/chrome/browser/extensions/active_script_controller_browsertest.cc
@@ -108,7 +108,7 @@ const Extension* ActiveScriptControllerBrowserTest::CreateExtension(
               "content_script" : "execute_script",
           host_type == ALL_HOSTS ? "all_hosts" : "explicit_hosts");
 
-  const char* permission_scheme =
+  const char* const permission_scheme =
       host_type == ALL_HOSTS ? kAllHostsScheme : kExplicitHostsScheme;
 
   std::string permissions = base::StringPrintf(
@@ -303,7 +303,7 @@ IN_PROC_BROWSER_TEST_F(ActiveScriptControllerBrowserTest,
   base::FilePath active_script_path =
       test_data_dir_.AppendASCII("active_script");
 
-  const char* kExtensionNames[] = {
+  const char* const kExtensionNames[] = {
       "inject_scripts_all_hosts",
       "inject_scripts_explicit_hosts",
       "content_scripts_all_hosts",
@@ -415,7 +415,7 @@ class FlagOffActiveScriptControllerBrowserTest
 
 IN_PROC_BROWSER_TEST_F(FlagOffActiveScriptControllerBrowserTest,
                        ScriptsExecuteWhenFlagAbsent) {
-  const char* kExtensionNames[] = {
+  const char* const kExtensionNames[] = {
     "content_scripts_all_hosts",
     "inject_scripts_all_hosts",
   };
diff --git a/chrome/browser/extensions/activity_log/activity_actions.cc b/chrome/browser/extensions/activity_log/activity_actions.cc
index c681cade..6912abd 100644
--- a/chrome/browser/extensions/activity_log/activity_actions.cc
+++ b/chrome/browser/extensions/activity_log/activity_actions.cc
@@ -38,7 +38,7 @@ namespace {
 
 // The "Extensions.PossibleAdInjection2" metric uses different Rappor
 // parameters than the original metric.
-const char* kExtensionAdInjectionRapporMetricName =
+const char kExtensionAdInjectionRapporMetricName[] =
     "Extensions.PossibleAdInjection2";
 
 const char kBlinkSetAttributeEvent[] = "blinkSetAttribute";
diff --git a/chrome/browser/extensions/activity_log/activity_database.cc b/chrome/browser/extensions/activity_log/activity_database.cc
index 09b868b..286f24e 100644
--- a/chrome/browser/extensions/activity_log/activity_database.cc
+++ b/chrome/browser/extensions/activity_log/activity_database.cc
@@ -202,8 +202,8 @@ void ActivityDatabase::SetTimerForTesting(int ms) {
 // static
 bool ActivityDatabase::InitializeTable(sql::Connection* db,
                                        const char* table_name,
-                                       const char* content_fields[],
-                                       const char* field_types[],
+                                       const char* const content_fields[],
+                                       const char* const field_types[],
                                        const int num_content_fields) {
   if (!db->DoesTableExist(table_name)) {
     std::string table_creator =
diff --git a/chrome/browser/extensions/activity_log/activity_database.h b/chrome/browser/extensions/activity_log/activity_database.h
index 8435709..e90683e 100644
--- a/chrome/browser/extensions/activity_log/activity_database.h
+++ b/chrome/browser/extensions/activity_log/activity_database.h
@@ -133,8 +133,8 @@ class ActivityDatabase {
   // field_types as content_fields, since the two arrays should correspond.
   static bool InitializeTable(sql::Connection* db,
                               const char* table_name,
-                              const char* content_fields[],
-                              const char* field_types[],
+                              const char* const content_fields[],
+                              const char* const field_types[],
                               const int num_content_fields);
 
   // Runs the given callback, passing it a handle to the database connection.
diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
index 4bef42b..da4bc2e 100644
--- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
@@ -44,11 +44,11 @@ namespace extensions {
 // the unit tests.
 class ActivityDatabaseTestPolicy : public ActivityDatabase::Delegate {
  public:
-  ActivityDatabaseTestPolicy() {};
+  ActivityDatabaseTestPolicy() {}
 
   static const char kTableName[];
-  static const char* kTableContentFields[];
-  static const char* kTableFieldTypes[];
+  static const char* const kTableContentFields[];
+  static const char* const kTableFieldTypes[];
 
   virtual void Record(ActivityDatabase* db, scoped_refptr<Action> action);
 
@@ -62,9 +62,9 @@ class ActivityDatabaseTestPolicy : public ActivityDatabase::Delegate {
 };
 
 const char ActivityDatabaseTestPolicy::kTableName[] = "actions";
-const char* ActivityDatabaseTestPolicy::kTableContentFields[] = {
+const char* const ActivityDatabaseTestPolicy::kTableContentFields[] = {
     "extension_id", "time", "action_type", "api_name"};
-const char* ActivityDatabaseTestPolicy::kTableFieldTypes[] = {
+const char* const ActivityDatabaseTestPolicy::kTableFieldTypes[] = {
     "LONGVARCHAR NOT NULL", "INTEGER", "INTEGER", "LONGVARCHAR"};
 
 bool ActivityDatabaseTestPolicy::InitDatabase(sql::Connection* db) {
diff --git a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
index df24455..ebdca47 100644
--- a/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_enabled_unittest.cc
@@ -24,7 +24,7 @@
 
 namespace extensions {
 
-const char* kExtensionID = "abjoigjokfeibfhiahiijggogladbmfm";
+const char kExtensionID[] = "abjoigjokfeibfhiahiijggogladbmfm";
 
 class ActivityLogEnabledTest : public ChromeRenderViewHostTestHarness {
  protected:
@@ -283,4 +283,4 @@ TEST_F(ActivityLogEnabledTest, AppAndCommandLine) {
   *CommandLine::ForCurrentProcess() = saved_cmdline_;
 }
 
-} // namespace extensions
+}  // namespace extensions
diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.cc b/chrome/browser/extensions/activity_log/activity_log_policy.cc
index 5b75bfd..58c9f6b 100644
--- a/chrome/browser/extensions/activity_log/activity_log_policy.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_policy.cc
@@ -25,8 +25,9 @@ namespace constants = activity_log_constants;
 namespace {
 // Obsolete database tables: these should be dropped from the database if
 // found.
-const char* kObsoleteTables[] = {"activitylog_apis", "activitylog_blocked",
-                                 "activitylog_urls"};
+const char* const kObsoleteTables[] = {"activitylog_apis",
+                                       "activitylog_blocked",
+                                       "activitylog_urls"};
 }  // namespace
 
 namespace extensions {
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index 72af356..bf43068 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -37,7 +37,7 @@ namespace {
 
 const char kExtensionId[] = "abc";
 
-const char* kUrlApiCalls[] = {
+const char* const kUrlApiCalls[] = {
     "HTMLButtonElement.formAction", "HTMLEmbedElement.src",
     "HTMLFormElement.action",       "HTMLFrameElement.src",
     "HTMLHtmlElement.manifest",     "HTMLIFrameElement.src",
diff --git a/chrome/browser/extensions/activity_log/counting_policy.cc b/chrome/browser/extensions/activity_log/counting_policy.cc
index 5581fb2..0b8695ad 100644
--- a/chrome/browser/extensions/activity_log/counting_policy.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy.cc
@@ -87,10 +87,10 @@ const ApiList kAlwaysLog[] = {
 
 // Columns in the main database table.  See the file-level comment for a
 // discussion of how data is stored and the meanings of the _x columns.
-const char* kTableContentFields[] = {
+const char* const kTableContentFields[] = {
     "count", "extension_id_x", "time", "action_type", "api_name_x", "args_x",
     "page_url_x", "page_title_x", "arg_url_x", "other_x"};
-const char* kTableFieldTypes[] = {
+const char* const kTableFieldTypes[] = {
     "INTEGER NOT NULL DEFAULT 1", "INTEGER NOT NULL", "INTEGER", "INTEGER",
     "INTEGER", "INTEGER", "INTEGER", "INTEGER", "INTEGER",
     "INTEGER"};
@@ -154,8 +154,8 @@ static const char kUrlTableCleanup[] =
 
 namespace extensions {
 
-const char* CountingPolicy::kTableName = "activitylog_compressed";
-const char* CountingPolicy::kReadViewName = "activitylog_uncompressed";
+const char CountingPolicy::kTableName[] = "activitylog_compressed";
+const char CountingPolicy::kReadViewName[] = "activitylog_uncompressed";
 
 CountingPolicy::CountingPolicy(Profile* profile)
     : ActivityLogDatabasePolicy(
@@ -230,7 +230,7 @@ void CountingPolicy::QueueAction(scoped_refptr<Action> action) {
 
 bool CountingPolicy::FlushDatabase(sql::Connection* db) {
   // Columns that must match exactly for database rows to be coalesced.
-  static const char* matched_columns[] = {
+  static const char* const matched_columns[] = {
       "extension_id_x", "action_type", "api_name_x", "args_x", "page_url_x",
       "page_title_x", "arg_url_x", "other_x"};
   ActionQueue queue;
diff --git a/chrome/browser/extensions/activity_log/counting_policy.h b/chrome/browser/extensions/activity_log/counting_policy.h
index 3926670..8c224c6 100644
--- a/chrome/browser/extensions/activity_log/counting_policy.h
+++ b/chrome/browser/extensions/activity_log/counting_policy.h
@@ -59,8 +59,8 @@ class CountingPolicy : public ActivityLogDatabasePolicy {
 
   // The main database table, and the name for a read-only view that
   // decompresses string values for easier parsing.
-  static const char* kTableName;
-  static const char* kReadViewName;
+  static const char kTableName[];
+  static const char kReadViewName[];
 
  protected:
   // The ActivityDatabase::Delegate interface.  These are always called from
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
index 22db6e6..00c7d77 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
@@ -33,12 +33,12 @@ namespace constants = activity_log_constants;
 
 namespace extensions {
 
-const char* FullStreamUIPolicy::kTableName = "activitylog_full";
-const char* FullStreamUIPolicy::kTableContentFields[] = {
+const char FullStreamUIPolicy::kTableName[] = "activitylog_full";
+const char* const FullStreamUIPolicy::kTableContentFields[] = {
   "extension_id", "time", "action_type", "api_name", "args", "page_url",
   "page_title", "arg_url", "other"
 };
-const char* FullStreamUIPolicy::kTableFieldTypes[] = {
+const char* const FullStreamUIPolicy::kTableFieldTypes[] = {
   "LONGVARCHAR NOT NULL", "INTEGER", "INTEGER", "LONGVARCHAR", "LONGVARCHAR",
   "LONGVARCHAR", "LONGVARCHAR", "LONGVARCHAR", "LONGVARCHAR"
 };
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.h b/chrome/browser/extensions/activity_log/fullstream_ui_policy.h
index 8a583e4..f468e11 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.h
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.h
@@ -53,9 +53,9 @@ class FullStreamUIPolicy : public ActivityLogDatabasePolicy {
   void DeleteDatabase() override;
 
   // Database table schema.
-  static const char* kTableName;
-  static const char* kTableContentFields[];
-  static const char* kTableFieldTypes[];
+  static const char kTableName[];
+  static const char* const kTableContentFields[];
+  static const char* const kTableFieldTypes[];
   static const int kTableFieldCount;
 
  protected:
diff --git a/chrome/browser/extensions/activity_log/generate_ad_network_hashes.py b/chrome/browser/extensions/activity_log/generate_ad_network_hashes.py
index 7d52c1f..4bac73e 100644
--- a/chrome/browser/extensions/activity_log/generate_ad_network_hashes.py
+++ b/chrome/browser/extensions/activity_log/generate_ad_network_hashes.py
@@ -52,7 +52,7 @@ _CC_TEMPLATE = '''\
 
 namespace extensions {
 
-const char* kHashedAdNetworks[] = {
+const char* const kHashedAdNetworks[] = {
   %(ad_networks)s
 };
 
diff --git a/chrome/browser/extensions/activity_log/hashed_ad_network_database.h b/chrome/browser/extensions/activity_log/hashed_ad_network_database.h
index a281bd9..dae2eee 100644
--- a/chrome/browser/extensions/activity_log/hashed_ad_network_database.h
+++ b/chrome/browser/extensions/activity_log/hashed_ad_network_database.h
@@ -16,7 +16,7 @@ class HashedAdNetworkDatabase : public AdNetworkDatabase {
   HashedAdNetworkDatabase();
   ~HashedAdNetworkDatabase() override;
 
-  void set_entries_for_testing(const char** entries, int num_entries) {
+  void set_entries_for_testing(const char* const* entries, int num_entries) {
     entries_ = entries;
     num_entries_ = num_entries;
   }
@@ -27,7 +27,7 @@ class HashedAdNetworkDatabase : public AdNetworkDatabase {
 
   // Points to the array of hash entries. In practice, this is always set to
   // kHashedAdNetworks, but is exposed via set_entries_for_testing().
-  const char** entries_;
+  const char* const* entries_;
 
   // The number of entries.
   int num_entries_;
diff --git a/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc b/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc
index 7f29413..8b53cec 100644
--- a/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc
+++ b/chrome/browser/extensions/activity_log/hashed_ad_network_database_unittest.cc
@@ -17,7 +17,7 @@ namespace extensions {
 namespace {
 
 // A list of fake ad networks.
-const char* kAdNetworkHosts[] = {
+const char* const kAdNetworkHosts[] = {
   "alpha.adnetwork",
   "bravo.adnetwork",
   "charlie.delta.adnetwork"
diff --git a/chrome/browser/extensions/activity_log/hashed_ad_networks.cc b/chrome/browser/extensions/activity_log/hashed_ad_networks.cc
index 539f789..0bef0a6 100644
--- a/chrome/browser/extensions/activity_log/hashed_ad_networks.cc
+++ b/chrome/browser/extensions/activity_log/hashed_ad_networks.cc
@@ -12,7 +12,7 @@
 
 namespace extensions {
 
-const char* kHashedAdNetworks[] = {
+const char* const kHashedAdNetworks[] = {
   "00020F0183BABB09",
   "00681CE94851B727",
   "0078BE5CA25F9492",
diff --git a/chrome/browser/extensions/activity_log/hashed_ad_networks.h b/chrome/browser/extensions/activity_log/hashed_ad_networks.h
index 9ba112d..ddec2b2 100644
--- a/chrome/browser/extensions/activity_log/hashed_ad_networks.h
+++ b/chrome/browser/extensions/activity_log/hashed_ad_networks.h
@@ -13,7 +13,7 @@
 
 namespace extensions {
 
-extern const char* kHashedAdNetworks[];
+extern const char* const kHashedAdNetworks[];
 extern const int kNumHashedAdNetworks;
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/activity_log/uma_policy_browsertest.cc b/chrome/browser/extensions/activity_log/uma_policy_browsertest.cc
index 3dcea7c..3110310 100644
--- a/chrome/browser/extensions/activity_log/uma_policy_browsertest.cc
+++ b/chrome/browser/extensions/activity_log/uma_policy_browsertest.cc
@@ -16,8 +16,8 @@
 
 using extensions::UmaPolicy;
 
-const char* kGooglePrefix = "ExtensionActivity.Google";
-const char* kNonGooglePrefix = "ExtensionActivity";
+const char kGooglePrefix[] = "ExtensionActivity.Google";
+const char kNonGooglePrefix[] = "ExtensionActivity";
 
 // These tests need to ensure that all of the extension JavaScript completes
 // before the histograms are checked. To accomplish this, the test relies on
@@ -209,14 +209,14 @@ IN_PROC_BROWSER_TEST_F(ActivityLogUmaPolicyTest, DISABLED_MultipleExtensions) {
       LoadExtension(test_data_dir_.AppendASCII("uma_policy"));
   ASSERT_TRUE(ext);
 
-  const char* script2 =
+  const char script2[] =
       "document.createElement('script');"
       "document.createElement('iframe');"
       "document.createElement('div');"
       "document.createElement('embed');"
       "document.createElement('object');";
 
-  const char* manifest =
+  const char manifest[] =
       "{"
       "  \"name\": \"Activity Log UMA Policy Test Extension\","
       "  \"version\": \"0.%s\","
@@ -248,13 +248,13 @@ IN_PROC_BROWSER_TEST_F(ActivityLogUmaPolicyTest, DISABLED_MultipleExtensions) {
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
       browser(), GURL("http://www.blocker.com"), 2);
 
-  const char* subset_one[] = {
+  const char* const subset_one[] = {
       "CreatedLink",
       "InnerHtml",
       "DocumentWrite"
   };
 
-  const char* subset_two[] = {
+  const char* const subset_two[] = {
       "ContentScript",
       "CreatedScript",
       "CreatedIframe",
@@ -297,5 +297,4 @@ IN_PROC_BROWSER_TEST_F(ActivityLogUmaPolicyTest, DISABLED_MultipleExtensions) {
         cnn_histogram->SnapshotSamples();
     EXPECT_EQ(1, cnn_samples->GetCount(2));
   }
-
 }
diff --git a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
index 509fde2..c5f4e83 100644
--- a/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
+++ b/chrome/browser/extensions/api/alarms/alarms_api_unittest.cc
@@ -89,9 +89,9 @@ class ExtensionAlarmsTest : public ExtensionApiUnittest {
 
   // Creates up to 3 alarms using the extension API.
   void CreateAlarms(size_t num_alarms) {
-    CHECK(num_alarms <= 3);
+    CHECK_LE(num_alarms, 3U);
 
-    const char* kCreateArgs[] = {
+    const char* const kCreateArgs[] = {
       "[null, {\"periodInMinutes\": 0.001}]",
       "[\"7\", {\"periodInMinutes\": 7}]",
       "[\"0\", {\"delayInMinutes\": 0}]",
@@ -460,8 +460,9 @@ class ExtensionAlarmsSchedulingTest : public ExtensionAlarmsTest {
     EXPECT_EQ(scheduled_time, alarm_manager_->next_poll_time_);
   }
 
-  static void RemoveAlarmCallback (bool success) { EXPECT_TRUE(success); }
-  static void RemoveAllAlarmsCallback () {}
+  static void RemoveAlarmCallback(bool success) { EXPECT_TRUE(success); }
+  static void RemoveAllAlarmsCallback() {}
+
  public:
   // Get the time that the alarm named is scheduled to run.
   void VerifyScheduledTime(const std::string& alarm_name) {
@@ -477,7 +478,7 @@ class ExtensionAlarmsSchedulingTest : public ExtensionAlarmsTest {
         base::Bind(&ExtensionAlarmsSchedulingTest::RemoveAlarmCallback));
   }
 
-  void RemoveAllAlarms () {
+  void RemoveAllAlarms() {
     alarm_manager_->RemoveAllAlarms(extension()->id(), base::Bind(
         &ExtensionAlarmsSchedulingTest::RemoveAllAlarmsCallback));
   }
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
index 96a79de..bc8409f 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
+++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
@@ -66,7 +66,7 @@ void BrailleControllerImpl::TryLoadLibBrlApi() {
     return;
   // These versions of libbrlapi work the same for the functions we
   // are using.  (0.6.0 adds brlapi_writeWText).
-  static const char* kSupportedVersions[] = {
+  static const char* const kSupportedVersions[] = {
     "libbrlapi.so.0.5",
     "libbrlapi.so.0.6"
   };
@@ -277,7 +277,7 @@ void BrailleControllerImpl::DispatchKeys() {
       VLOG(1) << "BrlAPI error: " << connection_->BrlapiStrError();
       Disconnect();
       return;
-    } else if (result == 0) { // No more data.
+    } else if (result == 0) {  // No more data.
       return;
     }
     scoped_ptr<KeyEvent> event = BrlapiKeyCodeToEvent(code);
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
index b82fa64..bb4e217 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
@@ -214,8 +214,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest,
       FILE_PATH_LITERAL("/plugins/foo.plugin");
   base::FilePath::CharType kBarPath[] =
       FILE_PATH_LITERAL("/plugins/bar.plugin");
-  const char* kFooName = "Foo Plugin";
-  const char* kBarName = "Bar Plugin";
+  const char kFooName[] = "Foo Plugin";
+  const char kBarName[] = "Bar Plugin";
 
   content::PluginService::GetInstance()->RegisterInternalPlugin(
       content::WebPluginInfo(base::ASCIIToUTF16(kFooName),
diff --git a/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc b/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc
index 8d881e6..d6538b7 100644
--- a/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc
+++ b/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc
@@ -20,14 +20,14 @@ namespace extensions {
 namespace {
 
 // Manifest permissions injected into |kManifest|:
-const char* kPermissions[] = {
+const char* const kPermissions[] = {
   "*://*/*",              // ALL
   "http://127.0.0.1/*",   // PARTICULAR
   "http://nowhere.com/*"  // NOWHERE
 };
 
 // Script matchers for injected into |kBackgroundScriptSource|:
-const char* kScriptMatchers[] = {
+const char* const kScriptMatchers[] = {
   "{ pageUrl: { hostContains: '' } }",          // ALL
   "{ pageUrl: { hostEquals: '127.0.0.1' } }",   // PARTICULAR
   "{ pageUrl: { hostEquals: 'nowhere.com' } }"  // NOWHERE
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
index 004ff2164..0c6bea8 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
@@ -558,7 +558,7 @@ TEST(WebRequestActionTest, GetName) {
       " \"lowerPriorityThan\": 123,"
       " \"hasTag\": \"some_tag\""
       "}]";
-  const char* kExpectedNames[] = {
+  const char* const kExpectedNames[] = {
     "declarativeWebRequest.RedirectRequest",
     "declarativeWebRequest.RedirectByRegEx",
     "declarativeWebRequest.SetRequestHeader",
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
index 36614b4..b49807d 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
@@ -643,7 +643,7 @@ TEST_F(WebRequestRulesRegistryTest, GetMatchesDifferentUrls) {
     GURL("http://fpfc.example.com")  // matching
   };
   // Which rules should match in subsequent test iterations.
-  const char* matchingRuleIds[] = { kRuleId1, kRuleId2 };
+  const char* const matchingRuleIds[] = { kRuleId1, kRuleId2 };
   COMPILE_ASSERT(arraysize(urls) == arraysize(firstPartyUrls),
                  urls_and_firstPartyUrls_need_to_have_the_same_size);
   COMPILE_ASSERT(arraysize(urls) == arraysize(matchingRuleIds),
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index 84e1842..4676961 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -167,7 +167,7 @@ const char kUrlRegexKey[] = "urlRegex";
 
 // Note: Any change to the danger type strings, should be accompanied by a
 // corresponding change to downloads.json.
-const char* kDangerStrings[] = {
+const char* const kDangerStrings[] = {
   kDangerSafe,
   kDangerFile,
   kDangerUrl,
@@ -183,7 +183,7 @@ COMPILE_ASSERT(arraysize(kDangerStrings) == content::DOWNLOAD_DANGER_TYPE_MAX,
 
 // Note: Any change to the state strings, should be accompanied by a
 // corresponding change to downloads.json.
-const char* kStateStrings[] = {
+const char* const kStateStrings[] = {
   kStateInProgress,
   kStateComplete,
   kStateInterrupted,
@@ -347,7 +347,8 @@ IconLoader::IconSize IconLoaderSizeFromPixelSize(int pixel_size) {
 
 typedef base::hash_map<std::string, DownloadQuery::FilterType> FilterTypeMap;
 
-void InitFilterTypeMap(FilterTypeMap& filter_types) {
+void InitFilterTypeMap(FilterTypeMap* filter_types_ptr) {
+  FilterTypeMap& filter_types = *filter_types_ptr;
   filter_types[kBytesReceivedKey] = DownloadQuery::FILTER_BYTES_RECEIVED;
   filter_types[kExistsKey] = DownloadQuery::FILTER_EXISTS;
   filter_types[kFilenameKey] = DownloadQuery::FILTER_FILENAME;
@@ -371,7 +372,8 @@ void InitFilterTypeMap(FilterTypeMap& filter_types) {
 
 typedef base::hash_map<std::string, DownloadQuery::SortType> SortTypeMap;
 
-void InitSortTypeMap(SortTypeMap& sorter_types) {
+void InitSortTypeMap(SortTypeMap* sorter_types_ptr) {
+  SortTypeMap& sorter_types = *sorter_types_ptr;
   sorter_types[kBytesReceivedKey] = DownloadQuery::SORT_BYTES_RECEIVED;
   sorter_types[kDangerKey] = DownloadQuery::SORT_DANGER;
   sorter_types[kEndTimeKey] = DownloadQuery::SORT_END_TIME;
@@ -454,8 +456,8 @@ void CompileDownloadQueryOrderBy(
   // comparisons.
   static base::LazyInstance<SortTypeMap> sorter_types =
     LAZY_INSTANCE_INITIALIZER;
-  if (sorter_types.Get().size() == 0)
-    InitSortTypeMap(sorter_types.Get());
+  if (sorter_types.Get().empty())
+    InitSortTypeMap(sorter_types.Pointer());
 
   for (std::vector<std::string>::const_iterator iter = order_by_strs.begin();
        iter != order_by_strs.end(); ++iter) {
@@ -487,8 +489,8 @@ void RunDownloadQuery(
   // comparisons.
   static base::LazyInstance<FilterTypeMap> filter_types =
     LAZY_INSTANCE_INITIALIZER;
-  if (filter_types.Get().size() == 0)
-    InitFilterTypeMap(filter_types.Get());
+  if (filter_types.Get().empty())
+    InitFilterTypeMap(filter_types.Pointer());
 
   DownloadQuery query_out;
 
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
index cc008fe..74ae306 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -1573,7 +1573,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
   ASSERT_TRUE(test_server()->Start());
   GoOnTheRecord();
 
-  static const char* kUnsafeHeaders[] = {
+  static const char* const kUnsafeHeaders[] = {
     "Accept-chArsEt",
     "accept-eNcoding",
     "coNNection",
@@ -1731,7 +1731,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
   LoadExtension("downloads_split");
   GoOnTheRecord();
 
-  static const char* kInvalidURLs[] = {
+  static const char* const kInvalidURLs[] = {
     "foo bar",
     "../hello",
     "/hello",
@@ -2122,7 +2122,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
   ASSERT_TRUE(test_server()->Start());
   std::string download_url = test_server()->GetURL("auth-basic").spec();
   // This is just base64 of 'username:secret'.
-  static const char* kAuthorization = "dXNlcm5hbWU6c2VjcmV0";
+  static const char kAuthorization[] = "dXNlcm5hbWU6c2VjcmV0";
   GoOnTheRecord();
 
   scoped_ptr<base::Value> result(RunFunctionAndReturnResult(
@@ -2351,7 +2351,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
 // NOTE: chrome disallows creating HTML5 FileSystem Files in incognito.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        MAYBE_DownloadExtensionTest_Download_FileSystemURL) {
-  static const char* kPayloadData = "on the record\ndata";
+  static const char kPayloadData[] = "on the record\ndata";
   GoOnTheRecord();
   LoadExtension("downloads_split");
 
@@ -4087,7 +4087,7 @@ TEST(DownloadInterruptReasonEnumsSynced,
   EXPECT_EQ(                                                                 \
       InterruptReasonExtensionToContent(downloads::INTERRUPT_REASON_##name), \
       content::DOWNLOAD_INTERRUPT_REASON_##name);
-#include "content/public/browser/download_interrupt_reason_values.h"
+#include "content/public/browser/download_interrupt_reason_values.h"  // NOLINT
 #undef INTERRUPT_REASON
 }
 
diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc
index ebf9895..86a7bc7 100644
--- a/chrome/browser/extensions/api/management/management_api_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc
@@ -249,7 +249,7 @@ class ExtensionManagementApiEscalationTest :
                   const std::string& expected_error) {
     scoped_refptr<ManagementSetEnabledFunction> function(
         new ManagementSetEnabledFunction);
-    const char* enabled_string = enabled ? "true" : "false";
+    const char* const enabled_string = enabled ? "true" : "false";
     if (user_gesture)
       function->set_user_gesture(true);
     bool response = util::RunFunction(
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
index 9140b0c..0ebb012 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -437,7 +437,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
-  const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
+  const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf";
   extensions::ExtensionUpdater::CheckParams params;
 
   base::FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
@@ -522,7 +522,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
 
 namespace {
 
-const char* kForceInstallNotEmptyHelp =
+const char kForceInstallNotEmptyHelp[] =
     "A policy may already be controlling the list of force-installed "
     "extensions. Please remove all policy settings from your computer "
     "before running tests. E.g. from /etc/chromium/policies Linux or "
@@ -534,7 +534,7 @@ const char* kForceInstallNotEmptyHelp =
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
-  const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
+  const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf";
 
   base::FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
 
@@ -615,7 +615,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
-  const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
+  const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf";
   extensions::ExtensionUpdater::CheckParams params;
   service->updater()->set_default_check_params(params);
   const size_t size_before = registry->enabled_extensions().size();
diff --git a/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc b/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
index 22b55f0..bb65b59 100644
--- a/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
+++ b/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
@@ -28,15 +28,15 @@ typedef base::Callback<bool(const void* bytes, size_t size)>
     IsValidMacAddressCallback;
 
 const char kDiskByUuidDirectoryName[] = "/dev/disk/by-uuid";
-const char* kDeviceNames[] = {
+const char* const kDeviceNames[] = {
   "sda1", "hda1", "dm-0", "xvda1", "sda2", "hda2", "dm-1", "xvda2",
 };
 // Fedora 15 uses biosdevname feature where Embedded ethernet uses the
 // "em" prefix and PCI cards use the p[0-9]c[0-9] format based on PCI
 // slot and card information.
-const char* kNetDeviceNamePrefixes[] = {
-   "eth", "em", "en", "wl", "ww", "p0", "p1", "p2", "p3", "p4", "p5", "p6",
-   "p7", "p8", "p9", "wlan"
+const char* const kNetDeviceNamePrefixes[] = {
+  "eth", "em", "en", "wl", "ww", "p0", "p1", "p2", "p3", "p4", "p5", "p6",
+  "p7", "p8", "p9", "wlan"
 };
 
 // Map from device name to disk uuid
@@ -99,7 +99,7 @@ class MacAddressProcessor {
   }
 
   bool ProcessInterface(struct ifaddrs *ifaddr,
-                        const char* prefixes[],
+                        const char* const prefixes[],
                         size_t prefixes_count) {
     const int MAC_LENGTH = 6;
     struct ifreq ifinfo;
@@ -132,7 +132,7 @@ class MacAddressProcessor {
 
  private:
   bool IsValidPrefix(const char* name,
-                     const char* prefixes[],
+                     const char* const prefixes[],
                      size_t prefixes_count) {
     for (size_t i = 0; i < prefixes_count; i++) {
       if (strncmp(prefixes[i], name, strlen(prefixes[i])) == 0)
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_constants.cc b/chrome/browser/extensions/api/proxy/proxy_api_constants.cc
index df2c8bb..3142b2f 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api_constants.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api_constants.cc
@@ -30,17 +30,17 @@ const char kProxyEventOnProxyError[] = "proxy.onProxyError";
 const char kPACDataUrlPrefix[] =
     "data:application/x-ns-proxy-autoconfig;base64,";
 
-const char* field_name[] = { "singleProxy",
-                             "proxyForHttp",
-                             "proxyForHttps",
-                             "proxyForFtp",
-                             "fallbackProxy" };
-
-const char* scheme_name[] = { "*error*",
-                              "http",
-                              "https",
-                              "ftp",
-                              "socks" };
+const char* const field_name[] = { "singleProxy",
+                                   "proxyForHttp",
+                                   "proxyForHttps",
+                                   "proxyForFtp",
+                                   "fallbackProxy" };
+
+const char* const scheme_name[] = { "*error*",
+                                    "http",
+                                    "https",
+                                    "ftp",
+                                    "socks" };
 
 COMPILE_ASSERT(SCHEME_MAX == SCHEME_FALLBACK,
                SCHEME_MAX_must_equal_SCHEME_FALLBACK);
@@ -51,4 +51,4 @@ COMPILE_ASSERT(arraysize(scheme_name) == SCHEME_MAX + 1,
 COMPILE_ASSERT(SCHEME_ALL == 0, singleProxy_must_be_first_option);
 
 }  // namespace proxy_api_constants
-}  // extensions
+}  // namespace extensions
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_constants.h b/chrome/browser/extensions/api/proxy/proxy_api_constants.h
index 6dc64d1..69f7093 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api_constants.h
+++ b/chrome/browser/extensions/api/proxy/proxy_api_constants.h
@@ -43,12 +43,12 @@ enum {
 
 // The names of the JavaScript properties to extract from the proxy_rules.
 // These must be kept in sync with the SCHEME_* constants.
-extern const char* field_name[];
+extern const char* const field_name[];
 
 // The names of the schemes to be used to build the preference value string
 // for manual proxy settings.  These must be kept in sync with the SCHEME_*
 // constants.
-extern const char* scheme_name[];
+extern const char* const scheme_name[];
 
 }  // namespace proxy_api_constants
 }  // namespace extensions
diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
index 6182c14..cccb653 100644
--- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
@@ -39,7 +39,7 @@ namespace {
 
 // Fake session tabs (used to construct arbitrary device info) and tab IDs
 // (used to construct arbitrary tab info) to use in all tests.
-const char* kSessionTags[] = {"tag0", "tag1", "tag2", "tag3", "tag4"};
+const char* const kSessionTags[] = {"tag0", "tag1", "tag2", "tag3", "tag4"};
 const SessionID::id_type kTabIDs[] = {5, 10, 13, 17};
 
 void BuildSessionSpecifics(const std::string& tag,
@@ -102,10 +102,10 @@ class ExtensionSessionsTest : public InProcessBrowserTest {
     fn->set_extension(extension_.get());
     fn->set_has_callback(has_callback);
     return fn;
-  };
+  }
 
   Browser* browser_;
-  scoped_refptr<extensions::Extension> extension_;
+  scoped_refptr<Extension> extension_;
 };
 
 void ExtensionSessionsTest::SetUpCommandLine(CommandLine* command_line) {
diff --git a/chrome/browser/extensions/api/socket/udp_socket_unittest.cc b/chrome/browser/extensions/api/socket/udp_socket_unittest.cc
index 48a51ac..d9c4993 100644
--- a/chrome/browser/extensions/api/socket/udp_socket_unittest.cc
+++ b/chrome/browser/extensions/api/socket/udp_socket_unittest.cc
@@ -50,7 +50,7 @@ TEST(UDPSocketUnitTest, TestUDPSocketRecvFrom) {
 }
 
 TEST(UDPSocketUnitTest, TestUDPMulticastJoinGroup) {
-  const char* kGroup = "237.132.100.17";
+  const char kGroup[] = "237.132.100.17";
   UDPSocket src("abcdefghijklmnopqrst");
   UDPSocket dest("abcdefghijklmnopqrst");
 
@@ -66,7 +66,7 @@ TEST(UDPSocketUnitTest, TestUDPMulticastJoinGroup) {
 }
 
 TEST(UDPSocketUnitTest, TestUDPMulticastTimeToLive) {
-  const char* kGroup = "237.132.100.17";
+  const char kGroup[] = "237.132.100.17";
   UDPSocket socket("abcdefghijklmnopqrst");
   EXPECT_NE(0, socket.SetMulticastTimeToLive(-1));  // Negative TTL shall fail.
   EXPECT_EQ(0, socket.SetMulticastTimeToLive(3));
@@ -74,7 +74,7 @@ TEST(UDPSocketUnitTest, TestUDPMulticastTimeToLive) {
 }
 
 TEST(UDPSocketUnitTest, TestUDPMulticastLoopbackMode) {
-  const char* kGroup = "237.132.100.17";
+  const char kGroup[] = "237.132.100.17";
   UDPSocket socket("abcdefghijklmnopqrst");
   EXPECT_EQ(0, socket.SetMulticastLoopbackMode(false));
   socket.Connect(kGroup, 13333, base::Bind(&OnConnected));
@@ -110,7 +110,7 @@ static void OnMulticastReadCompleted(bool *packet_received,
 
 TEST(UDPSocketUnitTest, TestUDPMulticastRecv) {
   const int kPort = 9999;
-  const char* const kGroup = "237.132.100.17";
+  const char kGroup[] = "237.132.100.17";
   bool packet_received = false;
   base::MessageLoopForIO io_loop;  // For Read to do its threaded work.
   UDPSocket dest("abcdefghijklmnopqrst");
diff --git a/chrome/browser/extensions/api/system_private/system_private_api.cc b/chrome/browser/extensions/api/system_private/system_private_api.cc
index 383b6ae..54048c1 100644
--- a/chrome/browser/extensions/api/system_private/system_private_api.cc
+++ b/chrome/browser/extensions/api/system_private/system_private_api.cc
@@ -24,7 +24,7 @@ namespace {
 
 // Maps prefs::kIncognitoModeAvailability values (0 = enabled, ...)
 // to strings exposed to extensions.
-const char* kIncognitoModeAvailabilityStrings[] = {
+const char* const kIncognitoModeAvailabilityStrings[] = {
   "enabled",
   "disabled",
   "forced"
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
index 52e95b6..4c2e996 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
@@ -51,7 +51,7 @@ const char kMediaStreamSourceTab[] = "tab";
 
 // Whitelisted extensions that do not check for a browser action grant because
 // they provide API's.
-const char* whitelisted_extensions[] = {
+const char* const whitelisted_extensions[] = {
   "enhhojjnijigcajfphajepfemndkmdlo",  // Dev
   "pkedcjkdefgpdelpbcmbmeomcjbeemfm",  // Trusted Tester
   "fmfcbgogabcbclcofgocippekhfcmgfj",  // Staging
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
index 75b900c..2cfa98f 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
@@ -14,7 +14,7 @@ namespace extensions {
 namespace {
 
 // URL schemes for which we'll send events.
-const char* kValidSchemes[] = {
+const char* const kValidSchemes[] = {
     content::kChromeUIScheme,
     url::kHttpScheme,
     url::kHttpsScheme,
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index bc63252..2f08120 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -695,7 +695,7 @@ TEST_F(ExtensionWebRequestTest, NoAccessRequestBodyData) {
   // a POST, PUT and GET request. For none of them the "requestBody" object
   // property should be present in the details passed to the onBeforeRequest
   // event listener.
-  const char* kMethods[] = { "POST", "PUT", "GET" };
+  const char* const kMethods[] = { "POST", "PUT", "GET" };
 
   // Set up a dummy extension name.
   const std::string kEventName(web_request::OnBeforeRequest::kEventName);
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index edddf023..96279af 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -77,7 +77,7 @@ void ExtensionWebRequestHelpersTestWithThreadsTest::SetUp() {
 
 TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
   net::TestURLRequestContext context;
-  const char* sensitive_urls[] = {
+  const char* const sensitive_urls[] = {
       "http://clients2.google.com",
       "http://clients22.google.com",
       "https://clients2.google.com",
@@ -92,7 +92,7 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
       "https://chrome.google.com/webstore/"
           "inlineinstall/detail/kcnhkahnjcbndmmehfkdnkjomaanaooo"
   };
-  const char* non_sensitive_urls[] = {
+  const char* const non_sensitive_urls[] = {
       "http://www.google.com/"
   };
   const int kSigninProcessId = 99;
diff --git a/chrome/browser/extensions/chrome_app_sorting.cc b/chrome/browser/extensions/chrome_app_sorting.cc
index 13bbc33..5f05f47 100644
--- a/chrome/browser/extensions/chrome_app_sorting.cc
+++ b/chrome/browser/extensions/chrome_app_sorting.cc
@@ -549,7 +549,7 @@ void ChromeAppSorting::CreateDefaultOrdinals() {
   std::vector<std::string> app_ids;
   chromeos::default_app_order::Get(&app_ids);
 #else
-  const char* kDefaultAppOrder[] = {
+  const char* const kDefaultAppOrder[] = {
     extension_misc::kChromeAppId,
     extensions::kWebStoreAppId,
   };
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc
index 91d1ab6..53d3b77 100644
--- a/chrome/browser/extensions/content_script_apitest.cc
+++ b/chrome/browser/extensions/content_script_apitest.cc
@@ -110,7 +110,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptExtensionProcess) {
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptFragmentNavigation) {
   ASSERT_TRUE(StartEmbeddedTestServer());
-  const char* extension_name = "content_scripts/fragment";
+  const char extension_name[] = "content_scripts/fragment";
   ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
 }
 
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 731c8ef..d9cf9ca 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -330,7 +330,7 @@ CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) {
 
   if (install_cause_ == extension_misc::INSTALL_CAUSE_USER_DOWNLOAD) {
     if (FeatureSwitch::easy_off_store_install()->IsEnabled()) {
-      const char* kHistogramName = "Extensions.OffStoreInstallDecisionEasy";
+      const char kHistogramName[] = "Extensions.OffStoreInstallDecisionEasy";
       if (is_gallery_install()) {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OnStoreInstall,
                                   NumOffStoreInstallDecision);
@@ -339,7 +339,7 @@ CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) {
                                   NumOffStoreInstallDecision);
       }
     } else {
-      const char* kHistogramName = "Extensions.OffStoreInstallDecisionHard";
+      const char kHistogramName[] = "Extensions.OffStoreInstallDecisionHard";
       if (is_gallery_install()) {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OnStoreInstall,
                                   NumOffStoreInstallDecision);
diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc
index 1688509..7b9c560 100644
--- a/chrome/browser/extensions/default_apps.cc
+++ b/chrome/browser/extensions/default_apps.cc
@@ -35,7 +35,7 @@ bool IsLocaleSupported() {
   // TODO(rogerta): Do this check dynamically once the webstore can expose
   // an API. See http://crbug.com/101357
   const std::string& locale = g_browser_process->GetApplicationLocale();
-  static const char* unsupported_locales[] = {"CN", "TR", "IR"};
+  static const char* const unsupported_locales[] = {"CN", "TR", "IR"};
   for (size_t i = 0; i < arraysize(unsupported_locales); ++i) {
     if (EndsWith(locale, unsupported_locales[i], false)) {
       return false;
diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc
index f5ffa2a..a290b45 100644
--- a/chrome/browser/extensions/error_console/error_console_browsertest.cc
+++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc
@@ -35,7 +35,7 @@ namespace {
 
 const char kTestingPage[] = "/extensions/test_file.html";
 const char kAnonymousFunction[] = "(anonymous function)";
-const char* kBackgroundPageName =
+const char* const kBackgroundPageName =
     extensions::kGeneratedBackgroundPageFilename;
 const int kNoFlags = 0;
 
@@ -274,6 +274,7 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest {
   }
 
   ErrorConsole* error_console() { return error_console_; }
+
  private:
   // The URL used in testing for simple page navigations.
   GURL test_url_;
@@ -391,7 +392,7 @@ IN_PROC_BROWSER_TEST_F(ErrorConsoleBrowserTest,
                   script_url,
                   "logHelloWorld",  // function name
                   6u,  // line number
-                  11u /* column number */ );
+                  11u /* column number */);
 
   CheckStackFrame(stack_trace1[1],
                   script_url,
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index 598a75c..fd2eea3 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -53,7 +53,7 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFileAfterClose) {
 // If crashing, mark disabled and update http://crbug.com/67774.
 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFragmentNavigation) {
   ASSERT_TRUE(StartEmbeddedTestServer());
-  const char* extension_name = "executescript/fragment";
+  const char extension_name[] = "executescript/fragment";
   ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
 }
 
diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
index 4fa5c92..9b5a4d9 100644
--- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
@@ -244,7 +244,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest,
 
 // Test that an error appears if an extension gets installed server side.
 IN_PROC_BROWSER_TEST_F(ExtensionDisabledGlobalErrorTest, RemoteInstall) {
-  static const char* extension_id = "pgdpcfcocojkjfbgpiianjngphoopgmo";
+  static const char extension_id[] = "pgdpcfcocojkjfbgpiianjngphoopgmo";
   ExtensionSyncService* sync_service =
       ExtensionSyncService::Get(browser()->profile());
 
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index 66755bb..29c93a7d 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -377,9 +377,9 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest,
   const Extension* extension = GetSingleLoadedExtension();
   // Simulate the user setting the keybinding to Ctrl+D.
 #if defined(OS_MACOSX)
-  const char* hotkey = "Command+D";
+  const char hotkey[] = "Command+D";
 #else
-  const char* hotkey = "Ctrl+D";
+  const char hotkey[] = "Ctrl+D";
 #endif  // defined(OS_MACOSX)
   command_service->UpdateKeybindingPrefs(
       extension->id(), manifest_values::kBrowserActionCommandEvent, hotkey);
diff --git a/chrome/browser/extensions/extension_loading_browsertest.cc b/chrome/browser/extensions/extension_loading_browsertest.cc
index 6f98393..4bcf968 100644
--- a/chrome/browser/extensions/extension_loading_browsertest.cc
+++ b/chrome/browser/extensions/extension_loading_browsertest.cc
@@ -32,7 +32,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionLoadingTest,
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   TestExtensionDir extension_dir;
-  const char* manifest_template =
+  const char manifest_template[] =
       "{"
       "  \"name\": \"Overrides New Tab\","
       "  \"version\": \"%d\","
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index d727ada..cae5667 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -213,7 +213,7 @@ class ExternallyConnectableMessagingTest : public ExtensionApiTest {
   testing::AssertionResult AreAnyNonWebApisDefinedForFrame(
       content::RenderFrameHost* frame) {
     // All runtime API methods are non-web except for sendRequest and connect.
-    const char* non_messaging_apis[] = {
+    const char* const non_messaging_apis[] = {
         "getBackgroundPage",
         "getManifest",
         "getURL",
@@ -622,7 +622,7 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
   // previously closed.
   tls_channel_id =
       GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true);
-   // And the empty value is still retrieved.
+  // And the empty value is still retrieved.
   EXPECT_EQ(std::string(), tls_channel_id);
 }
 
@@ -987,7 +987,7 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingWithTlsChannelIdTest,
   // previously closed.
   tls_channel_id =
       GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true);
-   // And the expected value is still retrieved.
+  // And the expected value is still retrieved.
   EXPECT_EQ(expected_tls_channel_id_value, tls_channel_id);
 }
 
diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc
index 800c181..00b032a 100644
--- a/chrome/browser/extensions/extension_nacl_browsertest.cc
+++ b/chrome/browser/extensions/extension_nacl_browsertest.cc
@@ -30,7 +30,7 @@ using extensions::Manifest;
 
 namespace {
 
-const char* kExtensionId = "bjjcibdiodkkeanflmiijlcfieiemced";
+const char kExtensionId[] = "bjjcibdiodkkeanflmiijlcfieiemced";
 
 // This class tests that the Native Client plugin is blocked unless the
 // .nexe is part of an extension from the Chrome Webstore.
@@ -142,7 +142,6 @@ class NaClExtensionTest : public ExtensionBrowserTest {
     CheckPluginsCreated(extension->GetResourceURL("test.html"),
                         expected_to_succeed);
   }
-
 };
 
 // Test that the NaCl plugin isn't blocked for Webstore extensions.
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 618ea40..0d7905f 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -1309,7 +1309,7 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
             extensions::ContentScriptsInfo::GetContentScripts(
                 loaded_[index].get()).size());
   EXPECT_EQ(Manifest::INTERNAL, loaded_[index]->location());
-};
+}
 
 // Test loading bad extensions from the profile directory.
 TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectoryFail) {
@@ -1345,7 +1345,7 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectoryFail) {
       l10n_util::GetStringUTF8(IDS_EXTENSIONS_LOAD_ERROR_MESSAGE) + " *. " +
       extensions::manifest_errors::kManifestUnreadable)) <<
       base::UTF16ToUTF8(GetErrors()[3]);
-};
+}
 
 // Test various cases for delayed install because of missing imports.
 TEST_F(ExtensionServiceTest, PendingImports) {
@@ -4260,7 +4260,7 @@ TEST_F(ExtensionServiceTest, ReloadExtensions) {
   base::FilePath path = data_dir().AppendASCII("good.crx");
   InstallCRX(path, INSTALL_NEW,
              Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT);
-  const char* extension_id = good_crx;
+  const char* const extension_id = good_crx;
   service()->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION);
 
   EXPECT_EQ(0u, registry()->enabled_extensions().size());
@@ -4299,7 +4299,7 @@ TEST_F(ExtensionServiceTest, ReloadExtension) {
   InitializeEmptyExtensionService();
 
   // Simple extension that should install without error.
-  const char* extension_id = "behllobkkfkfnphdnhnkndlbkcpglgmj";
+  const char extension_id[] = "behllobkkfkfnphdnhnkndlbkcpglgmj";
   base::FilePath ext = data_dir()
                            .AppendASCII("good")
                            .AppendASCII("Extensions")
@@ -6476,7 +6476,7 @@ TEST_F(ExtensionServiceTest,
   EXPECT_FALSE(
       registry()->GenerateInstalledExtensionsSet()->Contains(extension_ids[1]));
 }
-#endif // defined(ENABLE_MANAGED_USERS)
+#endif  // defined(ENABLE_MANAGED_USERS)
 
 TEST_F(ExtensionServiceTest, InstallPriorityExternalUpdateUrl) {
   InitializeEmptyExtensionService();
diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc
index 6e33a9a..f6ebc49 100644
--- a/chrome/browser/extensions/extension_util.cc
+++ b/chrome/browser/extensions/extension_util.cc
@@ -44,7 +44,7 @@ const char kExtensionAllowedOnAllUrlsPrefName[] =
 // Returns true if |extension_id| for an external component extension should
 // always be enabled in incognito windows.
 bool IsWhitelistedForIncognito(const std::string& extension_id) {
-  static const char* kExtensionWhitelist[] = {
+  static const char* const kExtensionWhitelist[] = {
     "D5736E4B5CF695CB93A2FB57E4FDC6E5AFAB6FE2",  // http://crbug.com/312900
     "D57DE394F36DC1C3220E7604C575D29C51A6C495",  // http://crbug.com/319444
     "3F65507A3B39259B38C8173C6FFA3D12DF64CCE9"   // http://crbug.com/371562
diff --git a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc b/chrome/browser/extensions/extension_warning_badge_service_unittest.cc
index a135c75..8c533b9 100644
--- a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc
+++ b/chrome/browser/extensions/extension_warning_badge_service_unittest.cc
@@ -53,8 +53,8 @@ bool HasBadge(Profile* profile) {
       NULL;
 }
 
-const char* ext1_id = "extension1";
-const char* ext2_id = "extension2";
+const char ext1_id[] = "extension1";
+const char ext2_id[] = "extension2";
 
 }  // namespace
 
diff --git a/chrome/browser/extensions/external_component_loader.cc b/chrome/browser/extensions/external_component_loader.cc
index 84f629f..f6379a2 100644
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -32,7 +32,7 @@ ExternalComponentLoader::~ExternalComponentLoader() {}
 // static
 bool ExternalComponentLoader::IsModifiable(const Extension* extension) {
   if (extension->location() == Manifest::EXTERNAL_COMPONENT) {
-    static const char* enhanced_extension_hashes[] = {
+    static const char* const enhanced_extension_hashes[] = {
         "D5736E4B5CF695CB93A2FB57E4FDC6E5AFAB6FE2",  // http://crbug.com/312900
         "D57DE394F36DC1C3220E7604C575D29C51A6C495",  // http://crbug.com/319444
         "3F65507A3B39259B38C8173C6FFA3D12DF64CCE9"   // http://crbug.com/371562
diff --git a/chrome/browser/extensions/hotword_browsertest.cc b/chrome/browser/extensions/hotword_browsertest.cc
index a1bf617..25e5f27 100644
--- a/chrome/browser/extensions/hotword_browsertest.cc
+++ b/chrome/browser/extensions/hotword_browsertest.cc
@@ -20,7 +20,7 @@
 
 namespace extensions {
 
-static const char* kHotwordHelperExtensionId =
+static const char kHotwordHelperExtensionId[] =
     "dnhpdliibojhegemfjheidglijccjfmc";
 
 class HotwordBrowserTest : public ExtensionBrowserTest {