chrome: Switch to use the ui_test_utils_* from chrome/browser/ui/.

chrome/chrome_tests.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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 94 matching lines @@
         'browser/chromeos/login/mock_login_status_consumer.h',
         'browser/chromeos/login/mock_login_utils.cc',
         'browser/chromeos/login/mock_login_utils.h',
         'browser/chromeos/login/mock_url_fetchers.cc',
         'browser/chromeos/login/mock_url_fetchers.h',
         'browser/chromeos/login/mock_user_manager.cc',
         'browser/chromeos/login/mock_user_manager.h',
         'browser/chromeos/settings/mock_signed_settings_helper.cc',
         'browser/chromeos/settings/mock_signed_settings_helper.h',
         # The only thing used from browser is Browser::Type.
-        'browser/download/download_test_file_chooser_observer.cc',
-        'browser/download/download_test_file_chooser_observer.h',
+        'browser/download/download_test_file_chooser_observer.cc',
+        'browser/download/download_test_file_chooser_observer.h',
         'browser/extensions/mock_extension_special_storage_policy.cc',
         'browser/extensions/mock_extension_special_storage_policy.h',
         'browser/extensions/test_extension_prefs.cc',
         'browser/extensions/test_extension_prefs.h',
         'browser/extensions/test_extension_service.cc',
         'browser/extensions/test_extension_service.h',
         'browser/extensions/test_extension_system.cc',
         'browser/extensions/test_extension_system.h',
         'browser/extensions/test_management_policy.cc',
         'browser/extensions/test_management_policy.h',
@@ skipping 39 matching lines @@
         'browser/protector/mock_setting_change.h',
         'browser/search_engines/template_url_service_test_util.cc',
         'browser/search_engines/template_url_service_test_util.h',
         'browser/sessions/session_service_test_helper.cc',
         'browser/sessions/session_service_test_helper.h',
         'browser/ssl/ssl_client_auth_requestor_mock.cc',
         'browser/ssl/ssl_client_auth_requestor_mock.h',
         'browser/ui/browser.h',
         'browser/ui/cocoa/run_loop_testing.h',
         'browser/ui/cocoa/run_loop_testing.mm',
+        'browser/ui/cocoa/test/ui_test_utils_mac.mm',
         'browser/ui/fullscreen/fullscreen_controller_test.cc',
         'browser/ui/fullscreen/fullscreen_controller_test.h',
+        'browser/ui/gtk/test/ui_test_utils_gtk.cc',
         'browser/ui/panels/base_panel_browser_test.cc',
         'browser/ui/panels/base_panel_browser_test.h',
         'browser/ui/panels/old_base_panel_browser_test.cc',
         'browser/ui/panels/old_base_panel_browser_test.h',
         'browser/ui/panels/test_panel_active_state_observer.cc',
         'browser/ui/panels/test_panel_active_state_observer.h',
         'browser/ui/panels/test_panel_mouse_watcher.cc',
         'browser/ui/panels/test_panel_mouse_watcher.h',
         'browser/ui/tab_contents/test_tab_contents.cc',
         'browser/ui/tab_contents/test_tab_contents.h',
+        'browser/ui/views/test/ui_test_utils_aura.cc',
+        'browser/ui/views/test/ui_test_utils_win.cc',
         'common/extensions/extension_builder.cc',
         'common/extensions/extension_builder.h',
         'common/extensions/value_builder.cc',
         'common/extensions/value_builder.h',
         'common/net/gaia/mock_url_fetcher_factory.h',
         'common/pref_store_observer_mock.cc',
         'common/pref_store_observer_mock.h',
         'renderer/chrome_mock_render_thread.cc',
         'renderer/chrome_mock_render_thread.h',
         'renderer/mock_printer.cc',
@@ skipping 49 matching lines @@
         'test/base/testing_pref_service.h',
         'test/base/testing_profile.cc',
         'test/base/testing_profile.h',
         'test/base/testing_profile_manager.cc',
         'test/base/testing_profile_manager.h',
         'test/base/thread_observer_helper.h',
         'test/base/tracing.cc',
         'test/base/tracing.h',
         'test/base/ui_test_utils.cc',
         'test/base/ui_test_utils.h',
-        'test/base/ui_test_utils_aura.cc',
-        'test/base/ui_test_utils_gtk.cc',
-        'test/base/ui_test_utils_mac.mm',
-        'test/base/ui_test_utils_win.cc',
         'test/logging/win/file_logger.cc',
         'test/logging/win/file_logger.h',
         'test/logging/win/log_file_printer.cc',
         'test/logging/win/log_file_printer.h',
         'test/logging/win/log_file_reader.cc',
         'test/logging/win/log_file_reader.h',
         'test/logging/win/mof_data_parser.cc',
         'test/logging/win/mof_data_parser.h',
         'test/logging/win/test_log_collector.cc',
         'test/logging/win/test_log_collector.h',
@@ skipping 4453 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'browser_tests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }