summaryrefslogtreecommitdiffstats
path: root/chromium/base/observer_list_perftest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 16:23:34 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:37:21 +0000
commit38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch)
treec4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/base/observer_list_perftest.cc
parente684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff)
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/observer_list_perftest.cc')
-rw-r--r--chromium/base/observer_list_perftest.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chromium/base/observer_list_perftest.cc b/chromium/base/observer_list_perftest.cc
index 6fe9c7be001..2e0e5e88c00 100644
--- a/chromium/base/observer_list_perftest.cc
+++ b/chromium/base/observer_list_perftest.cc
@@ -10,7 +10,6 @@
#include "base/observer_list.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
-#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/perf/perf_test.h"
@@ -62,12 +61,7 @@ typedef ::testing::Types<UnsafeObserver, TestCheckedObserver> ObserverTypes;
TYPED_TEST_CASE(ObserverListPerfTest, ObserverTypes);
// Performance test for base::ObserverList and Checked Observers.
-// Times out on Android (crbug.com/906686).
-#if defined(OS_ANDROID)
-TYPED_TEST(ObserverListPerfTest, DISABLED_NotifyPerformance) {
-#else
TYPED_TEST(ObserverListPerfTest, NotifyPerformance) {
-#endif
constexpr int kMaxObservers = 128;
#if DCHECK_IS_ON()
// The test takes about 100x longer in debug builds, mostly due to sequence