Revert 239280 "Move more file_util functions to base namespace."

trunk/src/base/files/file_util_proxy_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/files/file_util_proxy.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 302 matching lines @@
   // succeed.  On some platforms it may work with or without this flush.)
   FileUtilProxy::Flush(
       file_task_runner(),
       file,
       Bind(&FileUtilProxyTest::DidFinish, weak_factory_.GetWeakPtr()));
   MessageLoop::current()->Run();
   EXPECT_EQ(PLATFORM_FILE_OK, error_);
 
   // Verify the written data.
   char buffer[10];
-  EXPECT_EQ(data_bytes, base::ReadFile(test_path(), buffer, data_bytes));
+  EXPECT_EQ(data_bytes, file_util::ReadFile(test_path(), buffer, data_bytes));
   for (int i = 0; i < data_bytes; ++i) {
     EXPECT_EQ(data[i], buffer[i]);
   }
 }
 
 TEST_F(FileUtilProxyTest, Touch) {
   Time last_accessed_time = Time::Now() - TimeDelta::FromDays(12345);
   Time last_modified_time = Time::Now() - TimeDelta::FromHours(98765);
 
   FileUtilProxy::Touch(
@@ skipping 32 matching lines @@
       GetTestPlatformFile(PLATFORM_FILE_OPEN | PLATFORM_FILE_WRITE),
       7,
       Bind(&FileUtilProxyTest::DidFinish, weak_factory_.GetWeakPtr()));
   MessageLoop::current()->Run();
 
   // Verify.
   GetFileInfo(test_path(), &info);
   ASSERT_EQ(7, info.size);
 
   char buffer[7];
-  EXPECT_EQ(7, base::ReadFile(test_path(), buffer, 7));
+  EXPECT_EQ(7, file_util::ReadFile(test_path(), buffer, 7));
   int i = 0;
   for (; i < 7; ++i)
     EXPECT_EQ(kTestData[i], buffer[i]);
 }
 
 TEST_F(FileUtilProxyTest, Truncate_Expand) {
   // Setup.
   const char kTestData[] = "9876543210";
   ASSERT_EQ(10, file_util::WriteFile(test_path(), kTestData, 10));
   PlatformFileInfo info;
   GetFileInfo(test_path(), &info);
   ASSERT_EQ(10, info.size);
 
   // Run.
   FileUtilProxy::Truncate(
       file_task_runner(),
       GetTestPlatformFile(PLATFORM_FILE_OPEN | PLATFORM_FILE_WRITE),
       53,
       Bind(&FileUtilProxyTest::DidFinish, weak_factory_.GetWeakPtr()));
   MessageLoop::current()->Run();
 
   // Verify.
   GetFileInfo(test_path(), &info);
   ASSERT_EQ(53, info.size);
 
   char buffer[53];
-  EXPECT_EQ(53, base::ReadFile(test_path(), buffer, 53));
+  EXPECT_EQ(53, file_util::ReadFile(test_path(), buffer, 53));
   int i = 0;
   for (; i < 10; ++i)
     EXPECT_EQ(kTestData[i], buffer[i]);
   for (; i < 53; ++i)
     EXPECT_EQ(0, buffer[i]);
 }
 
 }  // namespace base