Fixes for re-enabling more MSVC level 4 warnings: base/ edition

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 39 matching lines @@
   {"", TRIM_ALL, "", TRIM_NONE},
   {"  ", TRIM_LEADING, "", TRIM_LEADING},
   {"  ", TRIM_TRAILING, "", TRIM_TRAILING},
   {"  ", TRIM_ALL, "", TRIM_ALL},
   {"\t\rTest String\n", TRIM_ALL, "Test String", TRIM_ALL},
 };
 
 namespace {
 
 // Helper used to test TruncateUTF8ToByteSize.
-bool Truncated(const std::string& input, const size_t byte_size,
+bool Truncated(const std::string& input,
+               const size_t byte_size,
                std::string* output) {
     size_t prev = input.length();
     TruncateUTF8ToByteSize(input, byte_size, output);
     return prev != output->length();
 }
 
 }  // namespace
 
 TEST(StringUtilTest, TruncateUTF8ToByteSize) {
   std::string output;
 
   // Empty strings and invalid byte_size arguments
   EXPECT_FALSE(Truncated(std::string(), 0, &output));
   EXPECT_EQ(output, "");
   EXPECT_TRUE(Truncated("\xe1\x80\xbf", 0, &output));
   EXPECT_EQ(output, "");
-  EXPECT_FALSE(Truncated("\xe1\x80\xbf", -1, &output));
+  EXPECT_FALSE(Truncated("\xe1\x80\xbf", static_cast<size_t>(-1), &output));
   EXPECT_FALSE(Truncated("\xe1\x80\xbf", 4, &output));
 
   // Testing the truncation of valid UTF8 correctly
   EXPECT_TRUE(Truncated("abc", 2, &output));
   EXPECT_EQ(output, "ab");
   EXPECT_TRUE(Truncated("\xc2\x81\xc2\x81", 2, &output));
   EXPECT_EQ(output.compare("\xc2\x81"), 0);
   EXPECT_TRUE(Truncated("\xc2\x81\xc2\x81", 3, &output));
   EXPECT_EQ(output.compare("\xc2\x81"), 0);
   EXPECT_FALSE(Truncated("\xc2\x81\xc2\x81", 4, &output));
@@ skipping 1096 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