Un-disable CertNetFetcherImplTests on Android.

net/cert_net/cert_net_fetcher_impl_unittest.cc

 // Copyright 2015 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 "net/cert_net/cert_net_fetcher_impl.h"
 
 #include <string>
 #include <utility>
 
 #include "base/compiler_specific.h"
@@ skipping 162 matching lines @@
 };
 
 // Helper to start an AIA fetch using default parameters.
 WARN_UNUSED_RESULT std::unique_ptr<CertNetFetcher::Request> StartRequest(
     CertNetFetcher* fetcher,
     const GURL& url) {
   return fetcher->FetchCaIssuers(url, CertNetFetcher::DEFAULT,
                                  CertNetFetcher::DEFAULT);
 }
 
-// Flaky on Android. See http://crbug.com/646147.
-#if defined(OS_ANDROID)
-#define MAYBE_ParallelFetchNoDuplicates DISABLED_ParallelFetchNoDuplicates
-#else
-#define MAYBE_ParallelFetchNoDuplicates ParallelFetchNoDuplicates
-#endif
 // Fetch a few unique URLs using GET in parallel. Each URL has a different body
 // and Content-Type.
-TEST_F(CertNetFetcherImplTest, MAYBE_ParallelFetchNoDuplicates) {
+TEST_F(CertNetFetcherImplTest, ParallelFetchNoDuplicates) {
   ASSERT_TRUE(test_server_.Start());
 
   auto fetcher = CreateFetcher();
 
   // Request a URL with Content-Type "application/pkix-cert"
   GURL url1 = test_server_.GetURL("/cert.crt");
   std::unique_ptr<CertNetFetcher::Request> request1 =
       StartRequest(fetcher.get(), url1);
 
   // Request a URL with Content-Type "application/pkix-crl"
@@ skipping 176 matching lines @@
 
   GURL url("https://foopy/foo.crt");
   std::unique_ptr<CertNetFetcher::Request> request =
       StartRequest(fetcher.get(), url);
 
   // Cancel the request (May or may not have started yet, as the request is
   // running on another thread).
   request.reset();
 }
 
-// Flaky on Android. See http://crbug.com/646147.
-#if defined(OS_ANDROID)
-#define MAYBE_CancelBeforeRunningMessageLoop \
-  DISABLED_CancelBeforeRunningMessageLoop
-#else
-#define MAYBE_CancelBeforeRunningMessageLoop CancelBeforeRunningMessageLoop
-#endif
 // Start a few requests, and cancel one of them before running the message loop
 // again.
-TEST_F(CertNetFetcherImplTest, MAYBE_CancelBeforeRunningMessageLoop) {
+TEST_F(CertNetFetcherImplTest, CancelBeforeRunningMessageLoop) {
   ASSERT_TRUE(test_server_.Start());
 
   auto fetcher = CreateFetcher();
 
   GURL url1 = test_server_.GetURL("/cert.crt");
   std::unique_ptr<CertNetFetcher::Request> request1 =
       StartRequest(fetcher.get(), url1);
 
   GURL url2 = test_server_.GetURL("/root.crl");
   std::unique_ptr<CertNetFetcher::Request> request2 =
@@ skipping 48 matching lines @@
   // it doesn't even try to connect to the server).
   VerifyFailure(ERR_DISALLOWED_URL_SCHEME, request3.get());
 
   // Cancel the second outstanding request.
   request2.reset();
 
   // Wait for the first request to complete and verify the fetch result.
   VerifySuccess("-cert.crt-\n", request1.get());
 }
 
-// Flaky on Android. See http://crbug.com/646147.
-#if defined(OS_ANDROID)
-#define MAYBE_ParallelFetchDuplicates DISABLED_ParallelFetchDuplicates
-#else
-#define MAYBE_ParallelFetchDuplicates ParallelFetchDuplicates
-#endif
 // Fetch the same URLs in parallel and verify that only 1 request is made per
 // URL.
-TEST_F(CertNetFetcherImplTest, MAYBE_ParallelFetchDuplicates) {
+TEST_F(CertNetFetcherImplTest, ParallelFetchDuplicates) {
   ASSERT_TRUE(test_server_.Start());
 
   auto fetcher = CreateFetcher();
 
   GURL url1 = test_server_.GetURL("/cert.crt");
   GURL url2 = test_server_.GetURL("/root.crl");
 
   // Issue 3 requests for url1, and 3 requests for url2
   std::unique_ptr<CertNetFetcher::Request> request1 =
       StartRequest(fetcher.get(), url1);
@@ skipping 21 matching lines @@
   VerifySuccess("-root.crl-\n", request2.get());
   VerifySuccess("-root.crl-\n", request4.get());
   VerifySuccess("-root.crl-\n", request5.get());
   VerifySuccess("-cert.crt-\n", request6.get());
 
   // Verify that only 2 URLRequests were started even though 6 requests were
   // issued.
   EXPECT_EQ(2, NumCreatedRequests());
 }
 
-// Flaky on Android. See http://crbug.com/646147.
-#if defined(OS_ANDROID)
-#define MAYBE_CancelThenStart DISABLED_CancelThenStart
-#else
-#define MAYBE_CancelThenStart CancelThenStart
-#endif
 // Cancel a request and then start another one for the same URL.
-TEST_F(CertNetFetcherImplTest, MAYBE_CancelThenStart) {
+TEST_F(CertNetFetcherImplTest, CancelThenStart) {
   ASSERT_TRUE(test_server_.Start());
 
   auto fetcher = CreateFetcher();
 
   GURL url = test_server_.GetURL("/cert.crt");
 
   std::unique_ptr<CertNetFetcher::Request> request1 =
       StartRequest(fetcher.get(), url);
   request1.reset();
 
@@ skipping 24 matching lines @@
   // Cancel all the requests.
   for (size_t i = 0; i < arraysize(request); ++i)
     request[i].reset();
 
   EXPECT_EQ(1, NumCreatedRequests());
 }
 
 }  // namespace
 
 }  // namespace net