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

trunk/src/chrome/browser/importer/firefox_profile_lock_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/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
@@ skipping 52 matching lines @@
 }
 
 // If for some reason the lock file is left behind by the previous owner, we
 // should still be able to lock it, at least in the Windows implementation.
 TEST_F(FirefoxProfileLockTest, ProfileLockOrphaned) {
   base::FilePath test_path = temp_dir_.path();
   base::FilePath lock_file_path =
       test_path.Append(FirefoxProfileLock::kLockFileName);
 
   // Create the orphaned lock file.
-  FILE* lock_file = base::OpenFile(lock_file_path, "w");
+  FILE* lock_file = file_util::OpenFile(lock_file_path, "w");
   ASSERT_TRUE(lock_file);
-  base::CloseFile(lock_file);
+  file_util::CloseFile(lock_file);
   EXPECT_TRUE(base::PathExists(lock_file_path));
 
   scoped_ptr<FirefoxProfileLock> lock;
   EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock.get());
   lock.reset(new FirefoxProfileLock(test_path));
   EXPECT_TRUE(lock->HasAcquired());
   lock->Unlock();
   EXPECT_FALSE(lock->HasAcquired());
 }
 
@@ skipping 16 matching lines @@
 
   lock1->Unlock();
   EXPECT_FALSE(lock1->HasAcquired());
 
   lock2->Lock();
   EXPECT_TRUE(lock2->HasAcquired());
   lock2->Unlock();
   EXPECT_FALSE(lock2->HasAcquired());
 }
 #endif