Move file_util to base/files/ directory.

base/os_compat_android_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/os_compat_android.h"
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 typedef testing::Test OsCompatAndroidTest;
 
 // Keep this Unittest DISABLED_ , because it actually creates a directory in the
 // device and it may be source of flakyness. For any changes in the mkdtemp
 // function, you should run this unittest in your local machine to check if it
 // passes.
@@ skipping 14 matching lines @@
 
   // Successfully create a tmp dir.
   FilePath sub_dir2 = tmp_dir.Append("XXXXXX");
   std::string sub_dir2_string = sub_dir2.value();
   // this should be OK since mkdtemp just replaces characters in place
   char* buffer2 = const_cast<char*>(sub_dir2_string.c_str());
   EXPECT_TRUE(mkdtemp(buffer2) != NULL);
 }
 
 }  // namespace base