Move PathIsWritable, DirectoryExists, ContentsEqual, and TextContentsEqual to the base namespace.

chrome/installer/util/move_tree_work_item_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 <windows.h>
 
 #include <fstream>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
@@ skipping 290 matching lines @@
   EXPECT_FALSE(base::PathExists(from_file));
   EXPECT_TRUE(base::PathExists(to_dir));
   EXPECT_EQ(0, ReadTextFile(to_file).compare(kTextContent1));
 
   // test rollback()
   work_item->Rollback();
 
   EXPECT_TRUE(base::PathExists(from_dir));
   EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
   EXPECT_TRUE(base::PathExists(to_dir));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, to_file));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, to_file));
 
   TerminateProcess(pi.hProcess, 0);
   EXPECT_TRUE(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0);
   CloseHandle(pi.hProcess);
   CloseHandle(pi.hThread);
 }
 
 // Move one file that is in use to destination.
 TEST_F(MoveTreeWorkItemTest, MoveFileInUse) {
   // Create an executable for source by copying ourself to a new source dir.
@@ skipping 34 matching lines @@
   scoped_ptr<MoveTreeWorkItem> work_item(
       WorkItem::CreateMoveTreeWorkItem(from_file,
                                        to_file,
                                        temp_to_dir_.path(),
                                        WorkItem::ALWAYS_MOVE));
   EXPECT_TRUE(work_item->Do());
 
   EXPECT_TRUE(base::PathExists(from_dir));
   EXPECT_FALSE(base::PathExists(from_file));
   EXPECT_TRUE(base::PathExists(to_dir));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, to_file));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, to_file));
 
   // Close the process and make sure all the conditions after Do() are
   // still true.
   TerminateProcess(pi.hProcess, 0);
   EXPECT_TRUE(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0);
   CloseHandle(pi.hProcess);
   CloseHandle(pi.hThread);
 
   EXPECT_TRUE(base::PathExists(from_dir));
   EXPECT_FALSE(base::PathExists(from_file));
   EXPECT_TRUE(base::PathExists(to_dir));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, to_file));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, to_file));
 
   // test rollback()
   work_item->Rollback();
 
   EXPECT_TRUE(base::PathExists(from_dir));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, from_file));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, from_file));
   EXPECT_TRUE(base::PathExists(to_dir));
   EXPECT_EQ(0, ReadTextFile(to_file).compare(kTextContent1));
 }
 
 // Move one directory from source to destination when destination already
 // exists.
 TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesFull) {
   // Create two level deep source dir
   base::FilePath from_dir1(temp_from_dir_.path());
   from_dir1 = from_dir1.AppendASCII("From_Dir1");
@@ skipping 139 matching lines @@
   // the source files.
   EXPECT_TRUE(base::PathExists(from_dir1));
   EXPECT_TRUE(base::PathExists(to_dir));
   EXPECT_TRUE(base::PathExists(orig_to_file));
   EXPECT_EQ(0, ReadTextFile(orig_to_file).compare(kTextContent1));
   EXPECT_EQ(0, ReadTextFile(from_file).compare(kTextContent1));
 
   // Also, after rollback the new "to" file should be gone.
   EXPECT_FALSE(base::PathExists(new_to_file2));
 }