Cleanup: Better constify some strings in base.

base/environment_unittest.cc

 // Copyright (c) 2011 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/environment.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 typedef PlatformTest EnvironmentTest;
 
 namespace base {
 
 TEST_F(EnvironmentTest, GetVar) {
   // Every setup should have non-empty PATH...
   scoped_ptr<Environment> env(Environment::Create());
   std::string env_value;
   EXPECT_TRUE(env->GetVar("PATH", &env_value));
   EXPECT_NE(env_value, "");
 }
 
 TEST_F(EnvironmentTest, GetVarReverse) {
   scoped_ptr<Environment> env(Environment::Create());
-  const char* kFooUpper = "FOO";
-  const char* kFooLower = "foo";
+  const char kFooUpper[] = "FOO";
+  const char kFooLower[] = "foo";
 
   // Set a variable in UPPER case.
   EXPECT_TRUE(env->SetVar(kFooUpper, kFooLower));
 
   // And then try to get this variable passing the lower case.
   std::string env_value;
   EXPECT_TRUE(env->GetVar(kFooLower, &env_value));
 
   EXPECT_STREQ(env_value.c_str(), kFooLower);
 
   EXPECT_TRUE(env->UnSetVar(kFooUpper));
 
-  const char* kBar = "bar";
+  const char kBar[] = "bar";
   // Now do the opposite, set the variable in the lower case.
   EXPECT_TRUE(env->SetVar(kFooLower, kBar));
 
   // And then try to get this variable passing the UPPER case.
   EXPECT_TRUE(env->GetVar(kFooUpper, &env_value));
 
   EXPECT_STREQ(env_value.c_str(), kBar);
 
   EXPECT_TRUE(env->UnSetVar(kFooLower));
 }
 
 TEST_F(EnvironmentTest, HasVar) {
   // Every setup should have PATH...
   scoped_ptr<Environment> env(Environment::Create());
   EXPECT_TRUE(env->HasVar("PATH"));
 }
 
 TEST_F(EnvironmentTest, SetVar) {
   scoped_ptr<Environment> env(Environment::Create());
 
-  const char* kFooUpper = "FOO";
-  const char* kFooLower = "foo";
+  const char kFooUpper[] = "FOO";
+  const char kFooLower[] = "foo";
   EXPECT_TRUE(env->SetVar(kFooUpper, kFooLower));
 
   // Now verify that the environment has the new variable.
   EXPECT_TRUE(env->HasVar(kFooUpper));
 
   std::string var_value;
   EXPECT_TRUE(env->GetVar(kFooUpper, &var_value));
   EXPECT_EQ(var_value, kFooLower);
 }
 
 TEST_F(EnvironmentTest, UnSetVar) {
   scoped_ptr<Environment> env(Environment::Create());
 
-  const char* kFooUpper = "FOO";
-  const char* kFooLower = "foo";
+  const char kFooUpper[] = "FOO";
+  const char kFooLower[] = "foo";
   // First set some environment variable.
   EXPECT_TRUE(env->SetVar(kFooUpper, kFooLower));
 
   // Now verify that the environment has the new variable.
   EXPECT_TRUE(env->HasVar(kFooUpper));
 
   // Finally verify that the environment variable was erased.
   EXPECT_TRUE(env->UnSetVar(kFooUpper));
 
   // And check that the variable has been unset.
   EXPECT_FALSE(env->HasVar(kFooUpper));
 }
 
 #if defined(OS_WIN)
 
 TEST_F(EnvironmentTest, AlterEnvironment) {
   const wchar_t empty[] = L"\0";
   const wchar_t a2[] = L"A=2\0";
   EnvironmentMap changes;
   string16 e;
 
   e = AlterEnvironment(empty, changes);
-  EXPECT_TRUE(e[0] == 0);
+  EXPECT_EQ(0, e[0]);
 
   changes[L"A"] = L"1";
   e = AlterEnvironment(empty, changes);
   EXPECT_EQ(string16(L"A=1\0\0", 5), e);
 
   changes.clear();
   changes[L"A"] = string16();
   e = AlterEnvironment(empty, changes);
   EXPECT_EQ(string16(L"\0\0", 2), e);
 
@@ skipping 46 matching lines @@
 
   changes.clear();
   changes["A"] = std::string();
   e = AlterEnvironment(a2, changes);
   EXPECT_TRUE(e[0] == NULL);
 }
 
 #endif
 
 }  // namespace base