Cleanup: Remove unneeded base/file_util.h includes in base.

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/file_util.h"
 #include "base/files/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 // This macro helps avoid wrapped lines in the test structs.
 #define FPL(x) FILE_PATH_LITERAL(x)
 
 // This macro constructs strings which can contain NULs.
 #define FPS(x) FilePath::StringType(FPL(x), arraysize(FPL(x)) - 1)
@@ skipping 1098 matching lines @@
     FilePath from_native = FilePath(cases[i].native);
     EXPECT_EQ(cases[i].utf8, from_native.AsUTF8Unsafe())
         << "i: " << i << ", input: " << cases[i].native;
     // Test the two file paths are identical.
     EXPECT_EQ(from_utf8.value(), from_native.value());
   }
 }
 
 TEST_F(FilePathTest, ConstructWithNUL) {
   // Assert FPS() works.
-  ASSERT_TRUE(FPS("a\0b").length() == 3);
+  ASSERT_EQ(3U, FPS("a\0b").length());
 
   // Test constructor strips '\0'
   FilePath path(FPS("a\0b"));
-  EXPECT_TRUE(path.value().length() == 1);
-  EXPECT_EQ(path.value(), FPL("a"));
+  EXPECT_EQ(1U, path.value().length());
+  EXPECT_EQ(FPL("a"), path.value());
 }
 
 TEST_F(FilePathTest, AppendWithNUL) {
   // Assert FPS() works.
-  ASSERT_TRUE(FPS("b\0b").length() == 3);
+  ASSERT_EQ(3U, FPS("b\0b").length());
 
   // Test Append() strips '\0'
   FilePath path(FPL("a"));
   path = path.Append(FPS("b\0b"));
-  EXPECT_TRUE(path.value().length() == 3);
+  EXPECT_EQ(3U, path.value().length());
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
-  EXPECT_EQ(path.value(), FPL("a\\b"));
+  EXPECT_EQ(FPL("a\\b"), path.value());
 #else
-  EXPECT_EQ(path.value(), FPL("a/b"));
+  EXPECT_EQ(FPL("a/b"), path.value());
 #endif
 }
 
 TEST_F(FilePathTest, ReferencesParentWithNUL) {
   // Assert FPS() works.
-  ASSERT_TRUE(FPS("..\0").length() == 3);
+  ASSERT_EQ(3U, FPS("..\0").length());
 
   // Test ReferencesParent() doesn't break with "..\0"
   FilePath path(FPS("..\0"));
   EXPECT_TRUE(path.ReferencesParent());
 }
 
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
 TEST_F(FilePathTest, NormalizePathSeparators) {
   const struct UnaryTestData cases[] = {
     { FPL("foo/bar"), FPL("foo\\bar") },
@@ skipping 59 matching lines @@
     { FPL("foo/"), FPL("foo/") }
   };
   for (size_t i = 0; i < arraysize(cases); ++i) {
     FilePath input = FilePath(cases[i].input).NormalizePathSeparators();
     FilePath expected = FilePath(cases[i].expected).NormalizePathSeparators();
     EXPECT_EQ(expected.value(), input.AsEndingWithSeparator().value());
   }
 }
 
 }  // namespace base