Disabled flaky SingleClientTypedUrlsSyncTest tests on Android

This CL disabled the following tests on Android.

* SingleClientTypedUrlsSyncTest.DeleteNonTyped
* SingleClientTypedUrlsSyncTest.TwoVisits
* SingleClientTypedUrlsSyncTest.DeleteTyped
* SingleClientTypedUrlsSyncTest.Sanity

TBR=mastiz@chromium.org

Bug: 1159479
Change-Id: I49a93df85f6e48bbd661e77e41c467787c4e8b68
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2596119Reviewed-by: Salvador Guerrero <salg@google.com>
Commit-Queue: Salvador Guerrero <salg@google.com>
Cr-Commit-Position: refs/heads/master@{#837747}

chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc

@@ -35,7 +35,13 @@ class SingleClientTypedUrlsSyncTest : public SyncTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, Sanity) {
+// Flaky on android: https://crbug.com/1159479
+#if defined(OS_ANDROID)
+#define MAYBE_Sanity DISABLED_Sanity
+#else
+#define MAYBE_Sanity Sanity
+#endif
+IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, MAYBE_Sanity) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(0U, urls.size());
@@ -53,7 +59,13 @@ IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, Sanity) {
   ASSERT_TRUE(CheckAllProfilesHaveSameTypedURLs());
 }
 
-IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, TwoVisits) {
+// Flaky on android: https://crbug.com/1159479
+#if defined(OS_ANDROID)
+#define MAYBE_TwoVisits DISABLED_TwoVisits
+#else
+#define MAYBE_TwoVisits TwoVisits
+#endif
+IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, MAYBE_TwoVisits) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(0U, urls.size());
@@ -73,7 +85,13 @@ IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, TwoVisits) {
   ASSERT_TRUE(CheckAllProfilesHaveSameTypedURLs());
 }
 
-IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, DeleteTyped) {
+// Flaky on android: https://crbug.com/1159479
+#if defined(OS_ANDROID)
+#define MAYBE_DeleteTyped DISABLED_DeleteTyped
+#else
+#define MAYBE_DeleteTyped DeleteTyped
+#endif
+IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, MAYBE_DeleteTyped) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(0U, urls.size());
@@ -100,7 +118,13 @@ IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, DeleteTyped) {
   ASSERT_TRUE(CheckAllProfilesHaveSameTypedURLs());
 }
 
-IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, DeleteNonTyped) {
+// Flaky on android: https://crbug.com/1159479
+#if defined(OS_ANDROID)
+#define MAYBE_DeleteNonTyped DISABLED_DeleteNonTyped
+#else
+#define MAYBE_DeleteNonTyped DeleteNonTyped
+#endif
+IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, MAYBE_DeleteNonTyped) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(0U, urls.size());