diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 21:56:30 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 21:56:30 +0000 |
| commit | 23751182044f1119eb82782214bb7e79f4341ff8 (patch) | |
| tree | fe96a371e22595b4cbe66e42504dc611d99c5ded /chrome | |
| parent | 6a876c6278da1f2bdb943153d0037ccf7d9659cd (diff) | |
| download | chromium_src-23751182044f1119eb82782214bb7e79f4341ff8.zip chromium_src-23751182044f1119eb82782214bb7e79f4341ff8.tar.gz chromium_src-23751182044f1119eb82782214bb7e79f4341ff8.tar.bz2 | |
Commneted out ShutdownSingleThreadedCleanup in debug builds to
suppress the TSan complaints. Enabled NonSearchToSearchDoesntSupportInstant
in intractive_ui_tests for Linux.
BUG=70810,61179
TEST=please test interactive_ui_tests.
Review URL: http://codereview.chromium.org/6546020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/instant/instant_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index 2087bae..06032fe 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -528,8 +528,8 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_SearchServerDoesntSupportInstant) { // Verifies transitioning from loading a non-search string to a search string // with the provider not supporting instant works (meaning we don't display // anything). -#if defined(OS_MACOSX) || defined(OS_LINUX) -// Showing as flaky on Mac and linux (chrome os) +#if defined(OS_MACOSX) +// Showing as flaky on Mac // http://crbug.com/70810 #define MAYBE_NonSearchToSearchDoesntSupportInstant \ DISABLED_NonSearchToSearchDoesntSupportInstant |