Mark KeygenHandlerTest.ConcurrencyTest no longer flakey.

net/base/keygen_handler_unittest.cc

 // Copyright (c) 2010 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/base/keygen_handler.h"
 
 #include "build/build_config.h" // Needs to be imported early for USE_NSS
 
 #if defined(USE_NSS)
 #include <private/pprthred.h>  // PR_DetachThread
@@ skipping 94 matching lines @@
     PR_DetachThread();
 #endif
   }
 
  private:
   base::WaitableEvent* event_;
   std::string challenge_;
   std::string* result_;
 };
 
-// See crbug.com/48006
-#if defined(OS_MACOSX)
-#define MAYBE_ConcurrencyTest FLAKY_ConcurrencyTest
-#else
-#define MAYBE_ConcurrencyTest ConcurrencyTest
-#endif
-
 // We asynchronously generate the keys so as not to hang up the IO thread. This
 // test tries to catch concurrency problems in the keygen implementation.
-TEST_F(KeygenHandlerTest, MAYBE_ConcurrencyTest) {
+TEST_F(KeygenHandlerTest, ConcurrencyTest) {
   const int NUM_HANDLERS = 5;
   base::WaitableEvent* events[NUM_HANDLERS] = { NULL };
   std::string results[NUM_HANDLERS];
   for (int i = 0; i < NUM_HANDLERS; i++) {
     events[i] = new base::WaitableEvent(false, false);
     WorkerPool::PostTask(FROM_HERE,
                          new ConcurrencyTestTask(events[i], "some challenge",
                                                  &results[i]),
                          true);
   }
 
   for (int i = 0; i < NUM_HANDLERS; i++) {
     // Make sure the job completed
     bool signaled = events[i]->Wait();
     EXPECT_TRUE(signaled);
     delete events[i];
     events[i] = NULL;
 
     LOG(INFO) << "KeygenHandler " << i << " produced: " << results[i];
     AssertValidSignedPublicKeyAndChallenge(results[i], "some challenge");
   }
 }
 
 }  // namespace
 
 }  // namespace net