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

base/file_version_info_unittest.cc

 // Copyright (c) 2011 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/file_util.h"
+#include "base/file_version_info.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/file_version_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "base/file_version_info_win.h"
 #endif
 
 using base::FilePath;
 
 namespace {
 
 #if defined(OS_WIN)
 FilePath GetTestDataPath() {
   FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("base");
   path = path.AppendASCII("data");
   path = path.AppendASCII("file_version_info_unittest");
   return path;
 }
 #endif
 
-}
+}  // namespace
 
 #if defined(OS_WIN)
 TEST(FileVersionInfoTest, HardCodedProperties) {
   const wchar_t* kDLLNames[] = {
     L"FileVersionInfoTest1.dll"
   };
 
   const wchar_t* kExpectedValues[1][15] = {
       // FileVersionInfoTest.dll
       L"Goooooogle",                      // company_name
@@ skipping 90 matching lines @@
   EXPECT_TRUE(version_info_win->GetValue(L"Custom prop 3",  &str));
   EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043", str);
   EXPECT_EQ(L"1600 Amphitheatre Parkway Mountain View, CA 94043",
             version_info_win->GetStringValue(L"Custom prop 3"));
 
   // Test an non-existing property.
   EXPECT_FALSE(version_info_win->GetValue(L"Unknown property",  &str));
   EXPECT_EQ(L"", version_info_win->GetStringValue(L"Unknown property"));
 }
 #endif