Move more files from chrome/test to chrome/test/base, part #2

chrome/chrome_tests.gypi

 # 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.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 125 matching lines @@
         'test/automation/dom_element_proxy.h',
         'test/automation/extension_proxy.cc',
         'test/automation/extension_proxy.h',
         'test/automation/javascript_execution_controller.cc',
         'test/automation/javascript_execution_controller.h',
         'test/automation/javascript_message_utils.h',
         'test/automation/tab_proxy.cc',
         'test/automation/tab_proxy.h',
         'test/automation/window_proxy.cc',
         'test/automation/window_proxy.h',
+        'test/base/bookmark_load_observer.cc',
+        'test/base/bookmark_load_observer.h',
         'test/base/in_process_browser_test.cc',
         'test/base/in_process_browser_test.h',
+        'test/base/model_test_utils.cc',
+        'test/base/model_test_utils.h',
+        'test/base/profile_mock.cc',
+        'test/base/profile_mock.h',
+        'test/base/signaling_task.cc',
+        'test/base/signaling_task.h',
         'test/base/ui_test_utils.cc',
         'test/base/ui_test_utils.h',
         'test/base/ui_test_utils_linux.cc',
         'test/base/ui_test_utils_mac.mm',
         'test/base/ui_test_utils_win.cc',
-        'test/bookmark_load_observer.cc',
-        'test/bookmark_load_observer.h',
         'test/chrome_process_util.cc',
         'test/chrome_process_util.h',
         'test/chrome_process_util_mac.cc',
-        'test/model_test_utils.cc',
-        'test/model_test_utils.h',
-        'test/profile_mock.cc',
-        'test/profile_mock.h',
-        'test/signaling_task.cc',
-        'test/signaling_task.h',
         'test/test_browser_window.cc',
         'test/test_browser_window.h',
         'test/test_launcher_utils.cc',
         'test/test_launcher_utils.h',
         'test/test_location_bar.cc',
         'test/test_location_bar.h',
         'test/test_navigation_observer.cc',
         'test/test_navigation_observer.h',
         'test/test_switches.cc',
         'test/test_switches.h',
@@ skipping 84 matching lines @@
         'test_support_common',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/automated_ui_tests/automated_ui_test_base.cc',
         'test/automated_ui_tests/automated_ui_test_base.h',
         'test/automation/proxy_launcher.cc',
         'test/automation/proxy_launcher.h',
-        'test/layout_test_http_server.cc',
-        'test/layout_test_http_server.h',
+        'test/base/layout_test_http_server.cc',
+        'test/base/layout_test_http_server.h',
         'test/ui/javascript_test_util.cc',
         'test/ui/npapi_test_helper.cc',
         'test/ui/npapi_test_helper.h',
         'test/ui/run_all_unittests.cc',
         'test/ui/ui_layout_test.cc',
         'test/ui/ui_layout_test.h',
         'test/ui/ui_perf_test.cc',
         'test/ui/ui_perf_test.h',
         'test/ui/ui_test.cc',
         'test/ui/ui_test.h',
@@ skipping 4076 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }