Fix more disabled MSVC warnings, base/ edition.

base/files/file_path_unittest.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.
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ skipping 752 matching lines @@
     { FPL("/foo.1234.tar.gz"),       FPL(".tar.gz") },
     { FPL("/foo.tar.tar.gz"),        FPL(".tar.gz") },
     { FPL("/foo.tar.gz.gz"),         FPL(".gz.gz") },
     { FPL("/foo.1234.user.js"),      FPL(".user.js") },
     { FPL("foo.user.js"),            FPL(".user.js") },
   };
   for (unsigned int i = 0; i < arraysize(cases); ++i) {
     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);

[Peter Kasting, 2014/09/23 23:07:34]

This was caught by "warn on unused locals"; turns out we were not actually
running tests for these cases...

     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();
   }
 }
 
 TEST_F(FilePathTest, InsertBeforeExtension) {
   const struct BinaryTestData cases[] = {
     { { FPL(""),                FPL("") },        FPL("") },
     { { FPL(""),                FPL("txt") },     FPL("") },
     { { FPL("."),               FPL("txt") },     FPL("") },
     { { FPL(".."),              FPL("txt") },     FPL("") },
     { { FPL("foo.dll"),         FPL("txt") },     FPL("footxt.dll") },
@@ skipping 481 matching lines @@
   for (size_t i = 0; i < arraysize(cases); ++i) {
     FilePath input(cases[i].input);
     bool observed = input.IsContentUri();
     EXPECT_EQ(cases[i].expected, observed) <<
               "i: " << i << ", input: " << input.value();
   }
 }
 #endif
 
 }  // namespace base