Fix more disabled MSVC warnings, base/ edition.

Mostly this fixes cases of "possible value truncation", usually by inserting
explicit typecasts.

BUG=81439
TEST=none

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

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


CrOS-Libchrome-Original-Commit: 9cf9b94a63dec7653bb48bac948deb4008b532c8
diff --git a/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc
index fa7627c..8b6f3a8 100644
--- a/base/files/file_path_unittest.cc
+++ b/base/files/file_path_unittest.cc
@@ -770,16 +770,16 @@
     FilePath path(cases[i].input);
     FilePath::StringType extension = path.Extension();
     FilePath::StringType final_extension = path.FinalExtension();
-    EXPECT_STREQ(cases[i].expected, extension.c_str()) << "i: " << i <<
-        ", path: " << path.value();
-    EXPECT_STREQ(cases[i].expected, final_extension.c_str()) << "i: " << i <<
-        ", path: " << path.value();
+    EXPECT_STREQ(cases[i].expected, extension.c_str())
+        << "i: " << i << ", path: " << path.value();
+    EXPECT_STREQ(cases[i].expected, final_extension.c_str())
+        << "i: " << i << ", path: " << path.value();
   }
   for (unsigned int i = 0; i < arraysize(double_extension_cases); ++i) {
-    FilePath path(cases[i].input);
+    FilePath path(double_extension_cases[i].input);
     FilePath::StringType extension = path.Extension();
-    EXPECT_STREQ(cases[i].expected, extension.c_str()) << "i: " << i <<
-        ", path: " << path.value();
+    EXPECT_STREQ(double_extension_cases[i].expected, extension.c_str())
+        << "i: " << i << ", path: " << path.value();
   }
 }