Reverting 30879.

chrome/test/interactive_ui/interactive_ui_tests.gypi

 {
   'target_name': 'interactive_ui_tests',
   'type': 'executable',
   'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0',
   'dependencies': [
     '<(DEPTH)/chrome/chrome.gyp:chrome',
     '<(DEPTH)/chrome/chrome.gyp:chrome_resources',
     '<(DEPTH)/chrome/chrome.gyp:chrome_strings',
     '<(DEPTH)/chrome/chrome.gyp:debugger',
     '<(DEPTH)/chrome/chrome.gyp:test_support_common',
     '<(DEPTH)/chrome/chrome.gyp:test_support_ui',
     '<(DEPTH)/chrome/chrome.gyp:syncapi',
     '<(DEPTH)/third_party/hunspell/hunspell.gyp:hunspell',
     '<(DEPTH)/net/net.gyp:net_resources',
     '<(DEPTH)/skia/skia.gyp:skia',
     '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
     '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
     '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
     '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
     '<(DEPTH)/testing/gtest.gyp:gtest',
     '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
     # run time dependency
     '<(DEPTH)/webkit/webkit.gyp:webkit_resources',
   ],
   'include_dirs': [
     '<(DEPTH)',
   ],
+  # TODO(phajdan.jr): Only temporary, to make transition easier.
   'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
   'sources': [
     '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc',
     '<(DEPTH)/chrome/browser/browser_focus_uitest.cc',
     '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc',
     '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc',
     '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc',
     '<(DEPTH)/chrome/browser/blocked_popup_container_interactive_uitest.cc',
     '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
     '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
     '<(DEPTH)/chrome/test/in_process_browser_test.cc',
     '<(DEPTH)/chrome/test/in_process_browser_test.h',
     '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
     '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
     '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
-    # TODO(jcampan): we should use in_proc_test_runner on Windows.
-    '<(DEPTH)/chrome/test/test_launcher/out_of_proc_test_runner.cc',
-    '<(DEPTH)/chrome/test/test_launcher/test_runner.cc',
-    '<(DEPTH)/chrome/test/test_launcher/test_runner.h',
-    '<(DEPTH)/chrome/test/test_launcher/run_all_unittests.cc',
-    '<(DEPTH)/chrome/test/unit/chrome_test_suite.h',
   ],
   'conditions': [
     ['OS=="linux"', {
       'dependencies': [
         '<(DEPTH)/build/linux/system.gyp:gtk',
         '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
       ],
       'sources!': [
+        # TODO(jcampan) - Re-enable failing browsertests on linux: (crbug.com/26540).
+        '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc',
+        '<(DEPTH)/chrome/browser/browser_focus_uitest.cc',
+        '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc',
         # TODO(port)
         '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc',
         '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc',
         '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc',
         '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc',
         '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc',
         '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h',
       ],
     }],  # OS=="linux"
     ['target_arch!="x64"', {
@@ skipping 65 matching lines @@
           'msvs_settings': {
             'VCLinkerTool': {
               'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
             },
           },
         },
       },  # configurations
     }],  # OS=="win"
   ],  # conditions
 }