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

chrome/browser/extensions/activity_log/counting_policy.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A policy for storing activity log data to a database that performs
 // aggregation to reduce the size of the database.  The database layout is
 // nearly the same as FullStreamUIPolicy, which stores a complete log, with a
 // few changes:
 //   - a "count" column is added to track how many log records were merged
 //     together into this row
@@ skipping 69 matching lines @@
     {Action::ACTION_API_CALL, "types.ChromeSetting.clear"},
     {Action::ACTION_API_CALL, "types.ChromeSetting.get"},
     {Action::ACTION_API_CALL, "types.ChromeSetting.set"},
     {Action::ACTION_CONTENT_SCRIPT, ""},
     {Action::ACTION_DOM_ACCESS, "Document.createElement"},
     {Action::ACTION_DOM_ACCESS, "Document.createElementNS"},
 };
 
 // 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"};
 
 // Miscellaneous SQL commands for initializing the database; these should be
 // idempotent.
 static const char kPolicyMiscSetup[] =
     // The activitylog_uncompressed view performs string lookups for simpler
     // access to the log data.
     "DROP VIEW IF EXISTS activitylog_uncompressed;\n"
@@ skipping 43 matching lines @@
     "DELETE FROM url_ids WHERE id NOT IN\n"
     "(SELECT page_url_x FROM activitylog_compressed\n"
     "    WHERE page_url_x IS NOT NULL\n"
     " UNION SELECT arg_url_x FROM activitylog_compressed\n"
     "    WHERE arg_url_x IS NOT NULL)";
 
 }  // namespace
 
 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(
           profile,
           base::FilePath(chrome::kExtensionActivityLogFilename)),
       string_table_("string_ids"),
       url_table_("url_ids"),
       retention_time_(base::TimeDelta::FromHours(60)) {
   for (size_t i = 0; i < arraysize(kAlwaysLog); i++) {
     api_arg_whitelist_.insert(
@@ skipping 54 matching lines @@
       queued_entry->first->set_time(
           max(queued_entry->first->time(), action->time()));
       queued_entry->second++;
     }
     activity_database()->AdviseFlush(queued_actions_.size());
   }
 }
 
 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;
   queue.swap(queued_actions_);
 
   // Whether to clean old records out of the activity log database.  Do this
   // much less frequently than database flushes since it is expensive, but
   // always check on the first database flush (since there might be a large
   // amount of data to clear).
   bool clean_database = (last_database_cleaning_time_.is_null() ||
@@ skipping 548 matching lines @@
   return true;
 }
 
 void CountingPolicy::Close() {
   // The policy object should have never been created if there's no DB thread.
   DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::DB));
   ScheduleAndForget(activity_database(), &ActivityDatabase::Close);
 }
 
 }  // namespace extensions