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

chrome/installer/util/copy_tree_work_item_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 <windows.h>
 
 #include <fstream>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
@@ skipping 85 matching lines @@
       WorkItem::CreateCopyTreeWorkItem(file_name_from,
                                        file_name_to,
                                        temp_dir_.path(),
                                        WorkItem::ALWAYS,
                                        base::FilePath()));
 
   EXPECT_TRUE(work_item->Do());
 
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
-  EXPECT_TRUE(file_util::ContentsEqual(file_name_from, file_name_to));
+  EXPECT_TRUE(base::ContentsEqual(file_name_from, file_name_to));
 
   // test rollback()
   work_item->Rollback();
 
   EXPECT_FALSE(base::PathExists(file_name_to));
   EXPECT_TRUE(base::PathExists(file_name_from));
 }
 
 // Copy one file, overwriting the existing one in destination.
 // Test with always_overwrite being true or false. The file is overwritten
@@ skipping 248 matching lines @@
   base::FilePath backup_file(work_item->backup_path_.path());
   EXPECT_FALSE(backup_file.empty());
   backup_file = backup_file.AppendASCII("File_To");
 
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
   EXPECT_EQ(0, ReadTextFile(file_name_to.value()).compare(text_content_1));
   // verify the file in used is moved to backup place.
   EXPECT_TRUE(base::PathExists(backup_file));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, backup_file));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, backup_file));
 
   // test rollback()
   work_item->Rollback();
 
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, file_name_to));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, file_name_to));
   // the backup file should be gone after rollback
   EXPECT_FALSE(base::PathExists(backup_file));
 
   TerminateProcess(pi.hProcess, 0);
   // make sure the handle is closed.
   EXPECT_TRUE(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0);
   CloseHandle(pi.hProcess);
   CloseHandle(pi.hThread);
 }
 
@@ skipping 43 matching lines @@
                                        file_name_to,
                                        temp_dir_.path(),
                                        WorkItem::NEW_NAME_IF_IN_USE,
                                        alternate_to));
 
   EXPECT_TRUE(work_item->Do());
 
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, file_name_to));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, file_name_to));
   // verify that the backup path does not exist
   EXPECT_TRUE(work_item->backup_path_.path().empty());
-  EXPECT_TRUE(file_util::ContentsEqual(file_name_from, alternate_to));
+  EXPECT_TRUE(base::ContentsEqual(file_name_from, alternate_to));
 
   // test rollback()
   work_item->Rollback();
 
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, file_name_to));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, file_name_to));
   EXPECT_TRUE(work_item->backup_path_.path().empty());
   // the alternate file should be gone after rollback
   EXPECT_FALSE(base::PathExists(alternate_to));
 
   TerminateProcess(pi.hProcess, 0);
   // make sure the handle is closed.
   EXPECT_TRUE(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0);
   CloseHandle(pi.hProcess);
   CloseHandle(pi.hThread);
 
   // Now the process has terminated, lets try overwriting the file again
   work_item.reset(WorkItem::CreateCopyTreeWorkItem(
       file_name_from, file_name_to,
       temp_dir_.path(), WorkItem::NEW_NAME_IF_IN_USE,
       alternate_to));
   if (IsFileInUse(file_name_to))
     base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(2));
   // If file is still in use, the rest of the test will fail.
   ASSERT_FALSE(IsFileInUse(file_name_to));
   EXPECT_TRUE(work_item->Do());
 
   // Get the path of backup file
   base::FilePath backup_file(work_item->backup_path_.path());
   EXPECT_FALSE(backup_file.empty());
   backup_file = backup_file.AppendASCII("File_To");
 
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
-  EXPECT_TRUE(file_util::ContentsEqual(file_name_from, file_name_to));
+  EXPECT_TRUE(base::ContentsEqual(file_name_from, file_name_to));
   // verify that the backup path does exist
   EXPECT_TRUE(base::PathExists(backup_file));
   EXPECT_FALSE(base::PathExists(alternate_to));
 
   // test rollback()
   work_item->Rollback();
 
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, file_name_to));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, file_name_to));
   // the backup file should be gone after rollback
   EXPECT_FALSE(base::PathExists(backup_file));
   EXPECT_FALSE(base::PathExists(alternate_to));
 }
 
 // Test overwrite option IF_NOT_PRESENT:
 // 1. If destination file/directory exist, the source should not be copied
 // 2. If destination file/directory do not exist, the source should be copied
 //    in the destination folder after Do() and should be rolled back after
 //    Rollback().
@@ skipping 30 matching lines @@
           file_name_to, temp_dir_.path(),
           WorkItem::IF_NOT_PRESENT,
           base::FilePath()));
   EXPECT_TRUE(work_item->Do());
 
   // verify that the source, destination have not changed and backup path
   // does not exist
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, file_name_to));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, file_name_to));
   EXPECT_FALSE(base::PathExists(backup_file));
 
   // test rollback()
   work_item->Rollback();
 
   // verify that the source, destination have not changed and backup path
   // does not exist after rollback also
   EXPECT_TRUE(base::PathExists(file_name_from));
   EXPECT_TRUE(base::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, file_name_to));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, file_name_to));
   EXPECT_FALSE(base::PathExists(backup_file));
 
   // Now delete the destination and try copying the file again.
   base::Delete(file_name_to, true);
   work_item.reset(WorkItem::CreateCopyTreeWorkItem(
       file_name_from, file_name_to,
       temp_dir_.path(), WorkItem::IF_NOT_PRESENT,
       base::FilePath()));
   EXPECT_TRUE(work_item->Do());
 
@@ skipping 68 matching lines @@
     backup_file = work_item->backup_path_.path();
     EXPECT_FALSE(backup_file.empty());
     backup_file = backup_file.AppendASCII("File_To");
 
     EXPECT_TRUE(base::PathExists(file_name_from));
     EXPECT_TRUE(base::PathExists(file_name_to));
     EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
     EXPECT_EQ(0, ReadTextFile(file_name_to.value()).compare(text_content_1));
     // verify the file in used is moved to backup place.
     EXPECT_TRUE(base::PathExists(backup_file));
-    EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, backup_file));
+    EXPECT_TRUE(base::ContentsEqual(exe_full_path, backup_file));
   }
 
   // verify the file in used should be still at the backup place.
   EXPECT_TRUE(base::PathExists(backup_file));
-  EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, backup_file));
+  EXPECT_TRUE(base::ContentsEqual(exe_full_path, backup_file));
 
   TerminateProcess(pi.hProcess, 0);
   // make sure the handle is closed.
   EXPECT_TRUE(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0);
   CloseHandle(pi.hProcess);
   CloseHandle(pi.hThread);
 }
 
 // Copy a tree from source to destination.
 // Flaky, http://crbug.com/59784.
@@ skipping 38 matching lines @@
 
     EXPECT_TRUE(work_item->Do());
   }
 
   base::FilePath file_name_to_1(dir_name_to);
   file_name_to_1 = file_name_to_1.AppendASCII("1");
   file_name_to_1 = file_name_to_1.AppendASCII("File_1.txt");
   EXPECT_TRUE(base::PathExists(file_name_to_1));
   VLOG(1) << "compare " << file_name_from_1.value()
           << " and " << file_name_to_1.value();
-  EXPECT_TRUE(file_util::ContentsEqual(file_name_from_1, file_name_to_1));
+  EXPECT_TRUE(base::ContentsEqual(file_name_from_1, file_name_to_1));
 
   base::FilePath file_name_to_2(dir_name_to);
   file_name_to_2 = file_name_to_2.AppendASCII("2");
   file_name_to_2 = file_name_to_2.AppendASCII("File_2.txt");
   EXPECT_TRUE(base::PathExists(file_name_to_2));
   VLOG(1) << "compare " << file_name_from_2.value()
           << " and " << file_name_to_2.value();
-  EXPECT_TRUE(file_util::ContentsEqual(file_name_from_2, file_name_to_2));
+  EXPECT_TRUE(base::ContentsEqual(file_name_from_2, file_name_to_2));
 }