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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e1ec9f8daf8578e301e3c7b3ed7e8b90be21f65f..348dde6568bab777cc481adddb14a955d19657b2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -112,8 +112,8 @@
         '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',
@@ -173,8 +173,10 @@
         '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',
@@ -185,6 +187,8 @@
         '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',
@@ -254,10 +258,6 @@
         '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',