Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5429)

Unified Diff: chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

Issue 10991051: Disable sync test StartURLServiceReady on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gtest_filter/unit_tests_disabled ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
index 8a0638968c176c06f6b5e79d617d8f06bb2812aa..77456ef3aadff907fb0e0e831d52ec2d875a1a6d 100644
--- a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc
@@ -108,13 +108,7 @@ class SyncSearchEngineDataTypeControllerTest : public testing::Test {
ModelLoadCallbackMock model_load_callback_;
};
-#if defined(OS_ANDROID)
-// Crashes on Android http://crbug.com/152599
-#define MAYBE_StartURLServiceReady DISABLED_StartURLServiceReady
-#else
-#define MAYBE_StartURLServiceReady StartURLServiceReady
-#endif
-TEST_F(SyncSearchEngineDataTypeControllerTest, MAYBE_StartURLServiceReady) {
+TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceReady) {
SetStartExpectations();
// We want to start ready.
PreloadTemplateURLService();
« no previous file with comments | « build/android/gtest_filter/unit_tests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698