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

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 478 matching lines @@
         '..',
       ],
       'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
       'sources': [
         'browser/accessibility/accessibility_mac_uitest.mm',
         'browser/autofill/autofill_browsertest.cc',
         'browser/browser_focus_uitest.cc',
         'browser/browser_keyevents_browsertest.cc',
         'browser/collected_cookies_uitest.cc',
         'browser/debugger/devtools_sanity_unittest.cc',
+        'browser/fast_shutdown_interactive_uitest.cc',
         'browser/instant/instant_browsertest.cc',
+        'browser/keyboard_access_uitest.cc',
+        'browser/mouseleave_interactive_uitest.cc',
         'browser/notifications/notifications_interactive_uitest.cc',
+        'browser/npapi_interactive_test.cc',
+        'browser/tab_contents/infobars_uitest.cc',
         'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
         'browser/ui/omnibox/omnibox_view_browsertest.cc',
         'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
         'browser/ui/views/button_dropdown_test.cc',
         'browser/ui/views/find_bar_host_interactive_uitest.cc',
         'browser/ui/views/menu_item_view_test.cc',
         'browser/ui/views/menu_model_adapter_test.cc',
         'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
         'browser/ui/views/tabs/tab_dragging_test.cc',
         'browser/ui/webui/workers_ui_browsertest.cc',
         'test/base/out_of_proc_test_runner.cc',
-        'test/interactive_ui/fast_shutdown_interactive_uitest.cc',
-        'test/interactive_ui/infobars_uitest.cc',
-        'test/interactive_ui/keyboard_access_uitest.cc',
-        'test/interactive_ui/mouseleave_interactive_uitest.cc',
-        'test/interactive_ui/npapi_interactive_test.cc',
-        'test/interactive_ui/view_event_test_base.cc',
-        'test/interactive_ui/view_event_test_base.h',
+        'test/base/view_event_test_base.cc',
+        'test/base/view_event_test_base.h',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:ssl',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
           'sources!': [
             # TODO(port)
+            'browser/npapi_interactive_test.cc',
             'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
             'browser/ui/views/button_dropdown_test.cc',
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/menu_item_view_test.cc',
             'browser/ui/views/menu_model_adapter_test.cc',
             'browser/ui/views/tabs/tab_dragging_test.cc',
             'browser/ui/views/tabs/tab_strip_interactive_uitest.cc',
-            'test/interactive_ui/npapi_interactive_test.cc',
-            'test/interactive_ui/view_event_test_base.cc',
-            'test/interactive_ui/view_event_test_base.h',
+            'test/base/view_event_test_base.cc',
+            'test/base/view_event_test_base.h',
           ],
         }],
         ['OS=="linux" and toolkit_views==1', {
           'sources!': [
+            # TODO(port)
+            'browser/npapi_interactive_test.cc',
+
             'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
-            # TODO(port)
-            'test/interactive_ui/npapi_interactive_test.cc',
           ],
         }],
         ['target_arch!="arm"', {
           'dependencies': [
             # run time dependency
             '../webkit/webkit.gyp:npapi_test_plugin',
           ],
         }],  # target_arch
         ['OS=="mac"', {
           'sources!': [
             # TODO(port)
+            'browser/npapi_interactive_test.cc',
             'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
             'browser/ui/views/button_dropdown_test.cc',
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/menu_item_view_test.cc',
             'browser/ui/views/menu_model_adapter_test.cc',
             'browser/ui/views/tabs/tab_dragging_test.cc',
             'browser/ui/views/tabs/tab_strip_interactive_uitest.cc',
-            'test/interactive_ui/npapi_interactive_test.cc',
-            'test/interactive_ui/view_event_test_base.cc',
-            'test/interactive_ui/view_event_test_base.h',
+            'test/base/view_event_test_base.cc',
+            'test/base/view_event_test_base.h',
             '../content/browser/debugger/devtools_sanity_unittest.cc',
           ],
           # See comment about the same line in chrome/chrome_tests.gypi.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }],  # OS=="mac"
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
@@ skipping 3556 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'
 }