Disable InstantExtendedTest.UpdateSearchQueryOnBackNavigation, InstantExtendedTest.UpdateSearchQuer…

chrome/browser/ui/search/instant_extended_interactive_uitest.cc

 // Copyright 2013 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.
 
 #include <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
@@ skipping 1449 matching lines @@
   // Install a new theme.
   ASSERT_NO_FATAL_FAILURE(InstallThemeAndVerify("theme2", "snowflake theme"));
 
   // Confirm that new tab is notified about the theme changed event.
   on_theme_changed_calls = 0;
   EXPECT_TRUE(GetIntFromJS(active_tab, "onThemeChangedCalls",
                            &on_theme_changed_calls));
   EXPECT_EQ(2, on_theme_changed_calls);
 }
 
-// Flaky on Mac Tests bot.
-#if defined(OS_MACOSX)
+// Flaky on Mac and Linux Tests bots.
+#if defined(OS_MACOSX) || defined(OS_LINUX)
 #define MAYBE_UpdateSearchQueryOnBackNavigation DISABLED_UpdateSearchQueryOnBackNavigation
 #else
 #define MAYBE_UpdateSearchQueryOnBackNavigation UpdateSearchQueryOnBackNavigation
 #endif
 // Test to verify that the omnibox search query is updated on browser
 // back button press event.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MAYBE_UpdateSearchQueryOnBackNavigation) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
@@ skipping 30 matching lines @@
   active_tab->GetController().GoBack();
   load_stop_observer.Wait();
 
   EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
   // Commit the search by pressing 'Enter'.
   FocusOmnibox();
   PressEnterAndWaitForNavigation();
   EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
 }
 
-// Flaky on Mac Tests bot.
-#if defined(OS_MACOSX)
+// Flaky on Mac and Linux Tests bots.
+#if defined(OS_MACOSX) || defined(OS_LINUX)
 #define MAYBE_UpdateSearchQueryOnForwardNavigation DISABLED_UpdateSearchQueryOnForwardNavigation
 #else
 #define MAYBE_UpdateSearchQueryOnForwardNavigation UpdateSearchQueryOnForwardNavigation
 #endif
 // Test to verify that the omnibox search query is updated on browser
 // forward button press events.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MAYBE_UpdateSearchQueryOnForwardNavigation) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
@@ skipping 98 matching lines @@
   content::WindowedNotificationObserver load_stop_observer_2(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<content::NavigationController>(
           &active_tab->GetController()));
   active_tab->GetController().GoBack();
   load_stop_observer_2.Wait();
 
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(chrome::IsInstantNTP(active_tab));
 }