Disable V4UpdateProtocolManagerTests on Android

components/safe_browsing_db/v4_update_protocol_manager_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
@@ skipping 105 matching lines @@
     EXPECT_EQ(expected.platform_type(), actual.platform_type());
     EXPECT_EQ(expected.response_type(), actual.response_type());
     EXPECT_EQ(expected.threat_entry_type(), actual.threat_entry_type());
     EXPECT_EQ(expected.threat_type(), actual.threat_type());
 
     // TODO(vakh): Test more fields from the proto.
   }
 }
 
 // TODO(vakh): Add many more tests.
-
-TEST_F(V4UpdateProtocolManagerTest, TestGetUpdatesErrorHandlingNetwork) {
+#if defined(OS_ANDROID)
+// Flakes on Android: https://crbug.com/598412
+#define MAYBE_TestGetUpdatesErrorHandlingNetwork \
+        DISABLED_TestGetUpdatesErrorHandlingNetwork
+#else
+#define MAYBE_TestGetUpdatesErrorHandlingNetwork \
+        TestGetUpdatesErrorHandlingNetwork
+#endif
+TEST_F(V4UpdateProtocolManagerTest, MAYBE_TestGetUpdatesErrorHandlingNetwork) {
   net::TestURLFetcherFactory factory;
   scoped_ptr<V4UpdateProtocolManager> pm(CreateProtocolManager());
 
   const std::vector<ListUpdateResponse> expected_lurs;
   const base::hash_set<UpdateListIdentifier> lists_to_update;
   const base::hash_map<UpdateListIdentifier, std::string> current_list_states;
   pm->GetUpdates(lists_to_update, current_list_states,
                  base::Bind(&ValidateGetUpdatesResults, expected_lurs));
 
   net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   DCHECK(fetcher);
   // Failed request status should result in error.
   fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::FAILED,
                                             net::ERR_CONNECTION_RESET));
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   // Should have recorded one error, but back off multiplier is unchanged.
   EXPECT_EQ(1ul, pm->update_error_count_);
   EXPECT_EQ(1ul, pm->update_back_off_mult_);
 }
 
-TEST_F(V4UpdateProtocolManagerTest, TestGetUpdatesErrorHandlingResponseCode) {
+#if defined(OS_ANDROID)
+// Flakes on Android: https://crbug.com/598412
+#define MAYBE_TestGetUpdatesErrorHandlingResponseCode \
+        DISABLED_TestGetUpdatesErrorHandlingResponseCode
+#else
+#define MAYBE_TestGetUpdatesErrorHandlingResponseCode \
+        TestGetUpdatesErrorHandlingResponseCode
+#endif
+TEST_F(V4UpdateProtocolManagerTest, \
+       MAYBE_TestGetUpdatesErrorHandlingResponseCode) {
   net::TestURLFetcherFactory factory;
   scoped_ptr<V4UpdateProtocolManager> pm(CreateProtocolManager());
 
   const std::vector<ListUpdateResponse> expected_lurs;
   const base::hash_set<UpdateListIdentifier> lists_to_update;
   const base::hash_map<UpdateListIdentifier, std::string> current_list_states;
   pm->GetUpdates(lists_to_update, current_list_states,
                  base::Bind(&ValidateGetUpdatesResults, expected_lurs));
 
 
   net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   DCHECK(fetcher);
   fetcher->set_status(net::URLRequestStatus());
   // Response code of anything other than 200 should result in error.
   fetcher->set_response_code(204);
   fetcher->SetResponseString(GetStockV4UpdateResponse());
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   // Should have recorded one error, but back off multiplier is unchanged.
   EXPECT_EQ(1ul, pm->update_error_count_);
   EXPECT_EQ(1ul, pm->update_back_off_mult_);
 }
 
-TEST_F(V4UpdateProtocolManagerTest, TestGetUpdatesNoError) {
+
+#if defined(OS_ANDROID)
+// Flakes on Android: https://crbug.com/598412
+#define MAYBE_TestGetUpdatesNoError \
+        DISABLED_TestGetUpdatesNoError
+#else
+#define MAYBE_TestGetUpdatesNoError \
+        TestGetUpdatesNoError
+#endif
+TEST_F(V4UpdateProtocolManagerTest, MAYBE_TestGetUpdatesNoError) {
   net::TestURLFetcherFactory factory;
   scoped_ptr<V4UpdateProtocolManager> pm(CreateProtocolManager());
 
 
   const std::vector<ListUpdateResponse> expected_lurs;
   base::hash_set<UpdateListIdentifier> lists_to_update;
   SetupListsToUpdate(&lists_to_update);
   base::hash_map<UpdateListIdentifier, std::string> current_list_states;
   SetupCurrentListStates(lists_to_update, &current_list_states);
   pm->GetUpdates(lists_to_update, current_list_states,
                  base::Bind(&ValidateGetUpdatesResults, expected_lurs));
   ClearListsToUpdate(&lists_to_update);
 
   net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   DCHECK(fetcher);
   fetcher->set_status(net::URLRequestStatus());
   fetcher->set_response_code(200);
   fetcher->SetResponseString(GetStockV4UpdateResponse());
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   // No error, back off multiplier is unchanged.
   EXPECT_EQ(0ul, pm->update_error_count_);
   EXPECT_EQ(1ul, pm->update_back_off_mult_);
 }
 
 }  // namespace safe_browsing