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

chrome/chrome_installer.gypi

 # 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.
 
 {
   'variables': {
     'lastchange_path': '../build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'conditions': [
@@ skipping 70 matching lines @@
             '../content/content.gyp:content_common',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'installer/setup/compat_checks_unittest.cc',
             'installer/setup/setup_constants.cc',
+            'installer/util/callback_work_item_unittest.cc',
             'installer/util/channel_info_unittest.cc',
-            'installer/util/callback_work_item_unittest.cc',
             'installer/util/copy_reg_key_work_item_unittest.cc',
             'installer/util/copy_tree_work_item_unittest.cc',
             'installer/util/create_dir_work_item_unittest.cc',
             'installer/util/create_reg_key_work_item_unittest.cc',
             'installer/util/delete_after_reboot_helper_unittest.cc',
             'installer/util/delete_reg_key_work_item_unittest.cc',
             'installer/util/delete_reg_value_work_item_unittest.cc',
             'installer/util/delete_tree_work_item_unittest.cc',
             'installer/util/duplicate_tree_detector_unittest.cc',
             'installer/util/fake_installation_state.h',
             'installer/util/fake_product_state.h',
             'installer/util/google_chrome_distribution_unittest.cc',
             'installer/util/google_update_settings_unittest.cc',
             'installer/util/install_util_unittest.cc',
-            'installer/util/installation_validator_unittest.cc',
             'installer/util/installation_validation_helper.cc',
             'installer/util/installation_validation_helper.h',
+            'installer/util/installation_validator_unittest.cc',
             'installer/util/installer_state_unittest.cc',
+            'installer/util/installer_util_test_common.cc',
+            'installer/util/installer_util_test_common.h',
             'installer/util/installer_util_unittests.rc',
             'installer/util/installer_util_unittests_resource.h',
             'installer/util/language_selector_unittest.cc',
             'installer/util/logging_installer_unittest.cc',
             'installer/util/lzma_util_unittest.cc',
             'installer/util/master_preferences_unittest.cc',
             'installer/util/move_tree_work_item_unittest.cc',
+            'installer/util/product_state_unittest.cc',
+            'installer/util/product_unittest.cc',
             'installer/util/product_unittest.h',
-            'installer/util/product_unittest.cc',
-            'installer/util/product_state_unittest.cc',
             'installer/util/registry_key_backup_unittest.cc',
             'installer/util/registry_test_data.cc',
             'installer/util/registry_test_data.h',
             'installer/util/run_all_unittests.cc',
             'installer/util/self_cleaning_temp_dir_unittest.cc',
             'installer/util/set_reg_value_work_item_unittest.cc',
             'installer/util/shell_util_unittest.cc',
             'installer/util/wmi_unittest.cc',
             'installer/util/work_item_list_unittest.cc',
           ],
@@ skipping 1047 matching lines @@
          'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': 'app/theme/chromium',
          'branding_dir_100': 'app/theme/default_100_percent/chromium',
       },
     }],
   ],
 }