diff options
| -rw-r--r-- | base/tracked_objects.h | 11 | ||||
| -rw-r--r-- | chrome/browser/instant/instant_browsertest.cc | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/base/tracked_objects.h b/base/tracked_objects.h index ed629c3..ac49225 100644 --- a/base/tracked_objects.h +++ b/base/tracked_objects.h @@ -643,13 +643,10 @@ class AutoTracking { #ifndef NDEBUG if (state_ != kRunning) return; - // Don't call these in a Release build: they just waste time. - // The following should ONLY be called when in single threaded mode. It is - // unsafe to do this cleanup if other threads are still active. - // It is also very unnecessary, so I'm only doing this in debug to satisfy - // purify (if we need to!). - ThreadData::ShutdownSingleThreadedCleanup(); - state_ = kTornDownAndStopped; + // We don't do cleanup of any sort in Release build because it is a + // complete waste of time. Since Chromium doesn't join all its thread and + // guarantee we're in a single threaded mode, we don't even do cleanup in + // debug mode, as it will generate race-checker warnings. #endif } 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 |