Cleanup: Better constify some strings in base.

base/strings/string_util_unittest.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.
 
 #include "base/strings/string_util.h"
 
 #include <math.h>
 #include <stdarg.h>
 
 #include <algorithm>
@@ skipping 443 matching lines @@
         EXPECT_FALSE(
             IsStringASCII(wchar_ascii.substr(0, len)));
         wchar_ascii[char_pos] &= ~0x10000;
 #endif  // WCHAR_T_IS_UTF32
       }
     }
   }
 }
 
 TEST(StringUtilTest, ConvertASCII) {
-  static const char* char_cases[] = {
+  static const char* const char_cases[] = {
     "Google Video",
     "Hello, world\n",
     "0123ABCDwxyz \a\b\t\r\n!+,.~"
   };
 
   static const wchar_t* const wchar_cases[] = {
     L"Google Video",
     L"Hello, world\n",
     L"0123ABCDwxyz \a\b\t\r\n!+,.~"
   };
@@ skipping 84 matching lines @@
     // the display of file sizes or bytes consistently around three
     // digits.
     {0, "0 B"},
     {512, "512 B"},
     {1024*1024, "1.0 MB"},
     {1024*1024*1024, "1.0 GB"},
     {10LL*1024*1024*1024, "10.0 GB"},
     {99LL*1024*1024*1024, "99.0 GB"},
     {105LL*1024*1024*1024, "105 GB"},
     {105LL*1024*1024*1024 + 500LL*1024*1024, "105 GB"},
-    {~(1LL<<63), "8192 PB"},
+    {~(1LL << 63), "8192 PB"},
 
     {99*1024 + 103, "99.1 kB"},
     {1024*1024 + 103, "1.0 MB"},
     {1024*1024 + 205 * 1024, "1.2 MB"},
     {1024*1024*1024 + (927 * 1024*1024), "1.9 GB"},
     {10LL*1024*1024*1024, "10.0 GB"},
     {100LL*1024*1024*1024, "100 GB"},
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
@@ skipping 566 matching lines @@
     { L"%f %d %o %u", true },
     { L"%-8d (%02.1f%)", true },
     { L"% 10s", false },
     { L"% 10ls", true }
   };
   for (size_t i = 0; i < arraysize(cases); ++i)
     EXPECT_EQ(cases[i].portable, base::IsWprintfFormatPortable(cases[i].input));
 }
 
 TEST(StringUtilTest, RemoveChars) {
-  const char* kRemoveChars = "-/+*";
+  const char kRemoveChars[] = "-/+*";
   std::string input = "A-+bc/d!*";
   EXPECT_TRUE(RemoveChars(input, kRemoveChars, &input));
   EXPECT_EQ("Abcd!", input);
 
   // No characters match kRemoveChars.
   EXPECT_FALSE(RemoveChars(input, kRemoveChars, &input));
   EXPECT_EQ("Abcd!", input);
 
   // Empty string.
   input.clear();
@@ skipping 92 matching lines @@
   const std::string live = kLive;
   std::string dead = live;
   strncpy(WriteInto(&dead, 5), kDead, 4);
   EXPECT_EQ(kDead, dead);
   EXPECT_EQ(4u, dead.size());
   EXPECT_EQ(kLive, live);
   EXPECT_EQ(4u, live.size());
 }
 
 }  // namespace base