installer and some misc files: Change ScopedTempDir::path() to GetPath()

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 "chrome/installer/util/copy_tree_work_item.h"
 
 #include <windows.h>
 
 #include <fstream>
 #include <memory>
@@ skipping 183 matching lines @@
   ASSERT_TRUE(base::PathExists(file_name_to));
 
   // test Do() with always_overwrite being true.
   std::unique_ptr<CopyTreeWorkItem> work_item(WorkItem::CreateCopyTreeWorkItem(
       file_name_from, file_name_to, temp_dir_.GetPath(), WorkItem::ALWAYS,
       base::FilePath()));
 
   EXPECT_TRUE(work_item->Do());
 
   // Get the path of backup file
-  base::FilePath backup_file(work_item->backup_path_.path());
+  base::FilePath backup_file(work_item->backup_path_.GetPath());
   EXPECT_FALSE(backup_file.empty());
   backup_file = backup_file.AppendASCII("File_To.txt");
 
   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));
   // we verify the file is overwritten by checking the existence of backup
   // file.
   EXPECT_TRUE(base::PathExists(backup_file));
@@ skipping 58 matching lines @@
   {
     // test Do().
     std::unique_ptr<CopyTreeWorkItem> work_item(
         WorkItem::CreateCopyTreeWorkItem(
             file_name_from, file_name_to, temp_dir_.GetPath(),
             WorkItem::IF_DIFFERENT, base::FilePath()));
 
     EXPECT_TRUE(work_item->Do());
 
     // Get the path of backup file
-    backup_file = work_item->backup_path_.path();
+    backup_file = work_item->backup_path_.GetPath();
     EXPECT_FALSE(backup_file.empty());
     backup_file = backup_file.AppendASCII("File_To.txt");
 
     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 is moved to backup place.
     EXPECT_TRUE(base::PathExists(backup_file));
     EXPECT_EQ(0, ReadTextFile(backup_file.value()).compare(text_content_2));
@@ skipping 40 matching lines @@
                        NULL, NULL, &si, &pi));
 
   // test Do().
   std::unique_ptr<CopyTreeWorkItem> work_item(WorkItem::CreateCopyTreeWorkItem(
       file_name_from, file_name_to, temp_dir_.GetPath(), WorkItem::IF_DIFFERENT,
       base::FilePath()));
 
   EXPECT_TRUE(work_item->Do());
 
   // Get the path of backup file
-  base::FilePath backup_file(work_item->backup_path_.path());
+  base::FilePath backup_file(work_item->backup_path_.GetPath());
   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(base::ContentsEqual(exe_full_path, backup_file));
@@ skipping 60 matching lines @@
       file_name_from, file_name_to, temp_dir_.GetPath(),
       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(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_FALSE(work_item->backup_path_created_);
   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(base::ContentsEqual(exe_full_path, file_name_to));
-  EXPECT_TRUE(work_item->backup_path_.path().empty());
+  EXPECT_FALSE(work_item->backup_path_created_);
   // 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_.GetPath(),
       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());
+  base::FilePath backup_file(work_item->backup_path_.GetPath());
   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(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));
@@ skipping 132 matching lines @@
   // test Do().
   {
     std::unique_ptr<CopyTreeWorkItem> work_item(
         WorkItem::CreateCopyTreeWorkItem(
             file_name_from, file_name_to, temp_dir_.GetPath(),
             WorkItem::IF_DIFFERENT, base::FilePath()));
 
     EXPECT_TRUE(work_item->Do());
 
     // Get the path of backup file
-    backup_file = work_item->backup_path_.path();
+    backup_file = work_item->backup_path_.GetPath();
     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(base::ContentsEqual(exe_full_path, backup_file));
@@ skipping 61 matching lines @@
   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(base::ContentsEqual(file_name_from_2, file_name_to_2));
 }