Move CopyFileHierarchy to a common test namespace and also use it in MoveTreeWorkItemTest.MoveDirec…

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"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
+#include "chrome/installer/util/installer_util_test_common.h"
+#include "chrome/installer/util/move_tree_work_item.h"
 #include "chrome/installer/util/work_item.h"
-#include "chrome/installer/util/move_tree_work_item.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 class MoveTreeWorkItemTest : public testing::Test {
  protected:
   virtual void SetUp() {
     ASSERT_TRUE(temp_from_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(temp_to_dir_.CreateUniqueTempDir());
   }
 
@@ skipping 352 matching lines @@
   work_item->Rollback();
 
   EXPECT_TRUE(file_util::PathExists(from_dir));
   EXPECT_TRUE(file_util::ContentsEqual(exe_full_path, from_file));
   EXPECT_TRUE(file_util::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,
-       FLAKY_MoveDirectoryDestExistsCheckForDuplicatesFull) {
+TEST_F(MoveTreeWorkItemTest, MoveDirectoryDestExistsCheckForDuplicatesFull) {
   // Create two level deep source dir
   FilePath from_dir1(temp_from_dir_.path());
   from_dir1 = from_dir1.AppendASCII("From_Dir1");
   file_util::CreateDirectory(from_dir1);
   ASSERT_TRUE(file_util::PathExists(from_dir1));
 
   FilePath from_dir2(from_dir1);
   from_dir2 = from_dir2.AppendASCII("From_Dir2");
   file_util::CreateDirectory(from_dir2);
   ASSERT_TRUE(file_util::PathExists(from_dir2));
 
   FilePath from_file(from_dir2);
   from_file = from_file.AppendASCII("From_File");
   CreateTextFile(from_file.value(), kTextContent1);
   ASSERT_TRUE(file_util::PathExists(from_file));
 
   // Create destination path
   FilePath to_dir(temp_from_dir_.path());
   to_dir = to_dir.AppendASCII("To_Dir");
   file_util::CreateDirectory(to_dir);

[grt (UTC plus 2), 2012/10/31 17:33:06]

is it equivalent to replace 410-414 with:
  // Create a sub-directory identical to the one in the source directory.
  installer::test::CopyFileHierarchy(from_dir1, to_dir);

[gab, 2012/11/01 15:52:05]

Yep, done.

   ASSERT_TRUE(file_util::PathExists(to_dir));
 
-  // Create a sub-directory of the same name as in the source directory.
-  FilePath to_dir2(to_dir);
-  to_dir2 = to_dir2.AppendASCII("From_Dir2");
-  file_util::CreateDirectory(to_dir2);
-  ASSERT_TRUE(file_util::PathExists(to_dir2));
+  // Create a sub-directory identical to the one in the source directory.
+  installer::test::CopyFileHierarchy(from_dir2, to_dir);
 
-  // Create an identical file in the to sub-directory.
-  FilePath orig_to_file(to_dir2);
-  orig_to_file = orig_to_file.AppendASCII("From_File");
-  CreateTextFile(orig_to_file.value(), kTextContent1);
-  ASSERT_TRUE(file_util::PathExists(orig_to_file));
-
-  // Lock one of the files in the to sub-directory to prevent moves.
+  // Lock one of the files in the to destination directory to prevent moves.
+  FilePath orig_to_file(
+      to_dir.AppendASCII("From_Dir2").AppendASCII("From_File"));
   file_util::MemoryMappedFile mapped_file;
   EXPECT_TRUE(mapped_file.Initialize(orig_to_file));
 
   // First check that we can't do the regular Move().
   scoped_ptr<MoveTreeWorkItem> work_item(
       WorkItem::CreateMoveTreeWorkItem(from_dir1,
                                        to_dir,
                                        temp_to_dir_.path(),
                                        WorkItem::ALWAYS_MOVE));
   EXPECT_FALSE(work_item->Do());
@@ skipping 108 matching lines @@
   // the source files.
   EXPECT_TRUE(file_util::PathExists(from_dir1));
   EXPECT_TRUE(file_util::PathExists(to_dir));
   EXPECT_TRUE(file_util::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(file_util::PathExists(new_to_file2));
 }