Reenable a couple of tests which already pass in interactive_ui_tests on Linux Aura

BUG=163931
TBR=erg

Review URL: https://codereview.chromium.org/157713003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251796 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/apps/web_view_interactive_browsertest.cc

@@ -422,7 +422,10 @@ class WebViewInteractiveTest
 // is for Windows and Linux only. As of Sept 17th, 2013 this test is disabled
 // on Windows due to flakines, see http://crbug.com/293445.
 
-#if defined(OS_LINUX)
+// Disabled on Linux Aura because pointer lock does not work on Linux Aura.
+// crbug.com/341876
+
+#if defined(OS_LINUX) && !defined(USE_AURA)
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PointerLock) {
   SetupTest("web_view/pointer_lock",
@@ -496,7 +499,7 @@ IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PointerLock) {
   }
 }
 
-#endif  // (defined(OS_WIN) || defined(OS_LINUX))
+#endif  // defined(OS_LINUX) && !defined(USE_AURA)
 
 // Tests that setting focus on the <webview> sets focus on the guest.
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, Focus_FocusEvent) {

chrome/chrome_tests.gypi

@@ -329,20 +329,16 @@
             'browser/notifications/notification_browsertest.cc',
             # TODO(port): I have no idea about the crashes in here; there's
             # nothing obviously wrong. It doesn't run on gtk today, either.
-            'browser/ui/views/button_dropdown_test.cc',
             'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
             # TODO(port): Everything here times out. Attempts have been made to
             # fix the individual failures, but each time I disable a test from
             # these suites, it seems like one or another starts timing out too.
-            'browser/apps/web_view_interactive_browsertest.cc',
-            'browser/extensions/api/extension_action/browser_action_interactive_test.cc',
-            'browser/extensions/api/omnibox/omnibox_api_interactive_test.cc',
             'browser/ui/omnibox/omnibox_view_browsertest.cc',
             'browser/extensions/api/tabs/tabs_interactive_test.cc',
-            'browser/ui/search/instant_extended_interactive_uitest.cc',
-            'browser/ui/startup/startup_browser_creator_interactive_uitest.cc',
             'browser/ui/views/keyboard_access_browsertest.cc',
-            'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
+            # TODO(port): These tests crash in
+            # UIControlsDesktopX11::SendMouseEvents().
+            #'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
           ],
         }],
         ['use_ash==1', {
@@ -362,7 +358,6 @@
           'sources!': [
             # TODO(port)
             'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
-            'browser/ui/views/button_dropdown_test.cc',
             'browser/ui/views/constrained_window_views_browsertest.cc',
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/keyboard_access_browsertest.cc',