Cleanup: Better constify some strings in chrome.

Also fix passing by non-const reference in chromedriver.

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

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

7 files changed, 22 insertions, 23 deletions

diff --git a/chrome/utility/cloud_print/pwg_encoder.cc b/chrome/utility/cloud_print/pwg_encoder.cc
index 5246bd9..194ccdf 100644
--- a/chrome/utility/cloud_print/pwg_encoder.cc
+++ b/chrome/utility/cloud_print/pwg_encoder.cc
@@ -24,7 +24,7 @@ const uint32 kGreenCoefficient = 7154;
 const uint32 kBlueCoefficient = 721;
 const uint32 kColorCoefficientDenominator = 10000;
 
-const char* kPwgKeyword = "RaS2";
+const char kPwgKeyword[] = "RaS2";
 
 const uint32 kHeaderSize = 1796;
 const uint32 kHeaderCupsDuplex = 272;
diff --git a/chrome/utility/extensions/unpacker_unittest.cc b/chrome/utility/extensions/unpacker_unittest.cc
index abf6b75..99939f1 100644
--- a/chrome/utility/extensions/unpacker_unittest.cc
+++ b/chrome/utility/extensions/unpacker_unittest.cc
@@ -132,7 +132,7 @@ TEST_F(UnpackerTest, NoL10n) {
 }
 
 TEST_F(UnpackerTest, UnzipDirectoryError) {
-  const char* kExpected = "Could not create directory for unzipping: ";
+  const char kExpected[] = "Could not create directory for unzipping: ";
   SetupUnpacker("good_package.crx");
   base::FilePath path =
       temp_dir_.path().AppendASCII(kTempExtensionName);
@@ -146,14 +146,14 @@ TEST_F(UnpackerTest, UnzipDirectoryError) {
 }
 
 TEST_F(UnpackerTest, UnzipError) {
-  const char* kExpected = "Could not unzip extension";
+  const char kExpected[] = "Could not unzip extension";
   SetupUnpacker("bad_zip.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_EQ(ASCIIToUTF16(kExpected), unpacker_->error_message());
 }
 
 TEST_F(UnpackerTest, BadPathError) {
-  const char* kExpected = "Illegal path (absolute or relative with '..'): ";
+  const char kExpected[] = "Illegal path (absolute or relative with '..'): ";
   SetupUnpacker("bad_path.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_TRUE(StartsWith(unpacker_->error_message(),
@@ -165,7 +165,7 @@ TEST_F(UnpackerTest, BadPathError) {
 
 
 TEST_F(UnpackerTest, ImageDecodingError) {
-  const char* kExpected = "Could not decode image: ";
+  const char kExpected[] = "Could not decode image: ";
   SetupUnpacker("bad_image.crx");
   EXPECT_FALSE(unpacker_->Run());
   EXPECT_TRUE(StartsWith(unpacker_->error_message(),
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc
index e54032b..fdb14cd 100644
--- a/chrome/utility/importer/firefox_importer.cc
+++ b/chrome/utility/importer/firefox_importer.cc
@@ -15,7 +15,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/importer/firefox_importer_utils.h"
-#include "chrome/common/importer/firefox_importer_utils.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/importer/importer_autofill_form_data_entry.h"
@@ -638,9 +637,9 @@ void FirefoxImporter::LoadRootNodeID(sql::Connection* db,
                                       int* toolbar_folder_id,
                                       int* menu_folder_id,
                                       int* unsorted_folder_id) {
-  static const char* kToolbarFolderName = "toolbar";
-  static const char* kMenuFolderName = "menu";
-  static const char* kUnsortedFolderName = "unfiled";
+  static const char kToolbarFolderName[] = "toolbar";
+  static const char kMenuFolderName[] = "menu";
+  static const char kUnsortedFolderName[] = "unfiled";
 
   const char query[] = "SELECT root_name, folder_id FROM moz_bookmarks_roots";
   sql::Statement s(db->GetUniqueStatement(query));
@@ -659,7 +658,7 @@ void FirefoxImporter::LoadRootNodeID(sql::Connection* db,
 
 void FirefoxImporter::LoadLivemarkIDs(sql::Connection* db,
                                        std::set<int>* livemark) {
-  static const char* kFeedAnnotation = "livemark/feedURI";
+  static const char kFeedAnnotation[] = "livemark/feedURI";
   livemark->clear();
 
   const char query[] =
diff --git a/chrome/utility/importer/nss_decryptor.cc b/chrome/utility/importer/nss_decryptor.cc
index 656b73f..8e9d85f 100644
--- a/chrome/utility/importer/nss_decryptor.cc
+++ b/chrome/utility/importer/nss_decryptor.cc
@@ -243,7 +243,7 @@ bool NSSDecryptor::ReadAndParseSignons(const base::FilePath& sqlite_file,
   if (!db.Open(sqlite_file))
     return false;
 
-  const char* query = "SELECT hostname FROM moz_disabledHosts";
+  const char query[] = "SELECT hostname FROM moz_disabledHosts";
   sql::Statement s(db.GetUniqueStatement(query));
   if (!s.is_valid())
     return false;
@@ -262,9 +262,9 @@ bool NSSDecryptor::ReadAndParseSignons(const base::FilePath& sqlite_file,
     forms->push_back(form);
   }
 
-  const char* query2 = "SELECT hostname, httpRealm, formSubmitURL, "
-                       "usernameField, passwordField, encryptedUsername, "
-                       "encryptedPassword FROM moz_logins";
+  const char query2[] = "SELECT hostname, httpRealm, formSubmitURL, "
+                        "usernameField, passwordField, encryptedUsername, "
+                        "encryptedPassword FROM moz_logins";
 
   sql::Statement s2(db.GetUniqueStatement(query2));
   if (!s2.is_valid())
diff --git a/chrome/utility/importer/safari_importer.mm b/chrome/utility/importer/safari_importer.mm
index 480eedd..e6fa2d7 100644
--- a/chrome/utility/importer/safari_importer.mm
+++ b/chrome/utility/importer/safari_importer.mm
@@ -120,7 +120,7 @@ bool SafariImporter::OpenDatabase(sql::Connection* db) {
 
 void SafariImporter::ImportFaviconURLs(sql::Connection* db,
                                        FaviconMap* favicon_map) {
-  const char* query = "SELECT iconID, url FROM PageURL;";
+  const char query[] = "SELECT iconID, url FROM PageURL;";
   sql::Statement s(db->GetUniqueStatement(query));
 
   while (s.Step() && !cancelled()) {
@@ -134,10 +134,10 @@ void SafariImporter::LoadFaviconData(
     sql::Connection* db,
     const FaviconMap& favicon_map,
     std::vector<ImportedFaviconUsage>* favicons) {
-  const char* query = "SELECT i.url, d.data "
-                      "FROM IconInfo i JOIN IconData d "
-                      "ON i.iconID = d.iconID "
-                      "WHERE i.iconID = ?;";
+  const char query[] = "SELECT i.url, d.data "
+                       "FROM IconInfo i JOIN IconData d "
+                       "ON i.iconID = d.iconID "
+                       "WHERE i.iconID = ?;";
   sql::Statement s(db->GetUniqueStatement(query));
 
   for (FaviconMap::const_iterator i = favicon_map.begin();
diff --git a/chrome/utility/web_resource_unpacker.cc b/chrome/utility/web_resource_unpacker.cc
index 3122200..648a5d1 100644
--- a/chrome/utility/web_resource_unpacker.cc
+++ b/chrome/utility/web_resource_unpacker.cc
@@ -7,10 +7,10 @@
 #include "base/json/json_reader.h"
 #include "base/values.h"
 
-const char* WebResourceUnpacker::kInvalidDataTypeError =
+const char WebResourceUnpacker::kInvalidDataTypeError[] =
     "Data from web resource server is missing or not valid JSON.";
 
-const char* WebResourceUnpacker::kUnexpectedJSONFormatError =
+const char WebResourceUnpacker::kUnexpectedJSONFormatError[] =
     "Data from web resource server does not have expected format.";
 
 WebResourceUnpacker::WebResourceUnpacker(const std::string &resource_data)
diff --git a/chrome/utility/web_resource_unpacker.h b/chrome/utility/web_resource_unpacker.h
index 18f045d..784ea00 100644
--- a/chrome/utility/web_resource_unpacker.h
+++ b/chrome/utility/web_resource_unpacker.h
@@ -23,8 +23,8 @@ class DictionaryValue;
 
 class WebResourceUnpacker {
  public:
-  static const char* kInvalidDataTypeError;
-  static const char* kUnexpectedJSONFormatError;
+  static const char kInvalidDataTypeError[];
+  static const char kUnexpectedJSONFormatError[];
 
   explicit WebResourceUnpacker(const std::string &resource_data);
   ~WebResourceUnpacker();