Revert of Revert of clang/win: Fix a few warnings in targets not in chromium_builder_tests.

rlz/win/lib/machine_deal_test.cc

 // Copyright (c) 2012 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 test application for the MachineDealCode class.
 //
 // These tests should not be executed on the build server:
 // - They assert for the failed cases.
 // - They modify machine state (registry).
 //
@@ skipping 54 matching lines @@
 
   EXPECT_FALSE(rlz_lib::MachineDealCode::Get(dcc_2, 2));
 }
 
 TEST_F(MachineDealCodeTest, SetFromPingResponse) {
   rlz_lib::MachineDealCode::Set("MyDCCode");
   char dcc_50[50];
 
   // Bad responses
 
-  char* kBadDccResponse =
+  const char kBadDccResponse[] =
     "dcc: NotMyDCCode \r\n"
     "set_dcc: NewDCCode\r\n"
     "crc32: 1B4D6BB3";
   EXPECT_FALSE(rlz_lib::MachineDealCode::SetFromPingResponse(
       kBadDccResponse));
   EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50));
   EXPECT_STREQ("MyDCCode", dcc_50);
 
-  char* kBadCrcResponse =
+  const char kBadCrcResponse[] =
     "dcc: MyDCCode \r\n"
     "set_dcc: NewDCCode\r\n"
     "crc32: 90707106";
   EXPECT_FALSE(rlz_lib::MachineDealCode::SetFromPingResponse(
       kBadCrcResponse));
   EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50));
   EXPECT_STREQ("MyDCCode", dcc_50);
 
   // Good responses
 
-  char* kMissingSetResponse =
+  const char kMissingSetResponse[] =
     "dcc: MyDCCode \r\n"
     "crc32: 35F2E717";
   EXPECT_TRUE(rlz_lib::MachineDealCode::SetFromPingResponse(
       kMissingSetResponse));
   EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50));
   EXPECT_STREQ("MyDCCode", dcc_50);
 
-  char* kGoodResponse =
+  const char kGoodResponse[] =
     "dcc: MyDCCode \r\n"
     "set_dcc: NewDCCode\r\n"
     "crc32: C8540E02";
   EXPECT_TRUE(rlz_lib::MachineDealCode::SetFromPingResponse(
       kGoodResponse));
   EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50));
   EXPECT_STREQ("NewDCCode", dcc_50);
 
-  char* kGoodResponse2 =
+  const char kGoodResponse2[] =
     "set_dcc: NewDCCode2  \r\n"
     "dcc:   NewDCCode \r\n"
     "crc32: 60B6409A";
   EXPECT_TRUE(rlz_lib::MachineDealCode::SetFromPingResponse(
       kGoodResponse2));
   EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50));
   EXPECT_STREQ("NewDCCode2", dcc_50);
 
   MachineDealCodeHelper::Clear();
-  char* kGoodResponse3 =
+  const char kGoodResponse3[] =
     "set_dcc: NewDCCode  \r\n"
     "crc32: 374C1C47";
   EXPECT_TRUE(rlz_lib::MachineDealCode::SetFromPingResponse(
       kGoodResponse3));
   EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50));
   EXPECT_STREQ("NewDCCode", dcc_50);
 
   MachineDealCodeHelper::Clear();
-  char* kGoodResponse4 =
+  const char kGoodResponse4[] =
     "dcc:   \r\n"
     "set_dcc: NewDCCode  \r\n"
     "crc32: 0AB1FB39";
   EXPECT_TRUE(rlz_lib::MachineDealCode::SetFromPingResponse(
       kGoodResponse4));
   EXPECT_TRUE(rlz_lib::MachineDealCode::Get(dcc_50, 50));
   EXPECT_STREQ("NewDCCode", dcc_50);
 }
 
 TEST_F(MachineDealCodeTest, GetAsCgi) {
   MachineDealCodeHelper::Clear();
   char cgi_50[50], cgi_2[2];
   cgi_50[0] = 0;
   cgi_2[0] = 0;
 
   EXPECT_FALSE(rlz_lib::MachineDealCode::GetAsCgi(cgi_50, 50));
   EXPECT_STREQ("", cgi_50);
 
   EXPECT_TRUE(rlz_lib::MachineDealCode::Set("dcc_value"));
 
   EXPECT_TRUE(rlz_lib::MachineDealCode::GetAsCgi(cgi_50, 50));
   EXPECT_STREQ("dcc=dcc_value", cgi_50);
 
   EXPECT_FALSE(rlz_lib::MachineDealCode::GetAsCgi(cgi_2, 2));
 }