| Index: net/base/keygen_handler_unittest.cc
|
| diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
|
| index cf8319fd040b58b74596c154bd781515b6596a4a..15ec0ce7eeb18549b44735463cc7b3b8e01740d4 100644
|
| --- a/net/base/keygen_handler_unittest.cc
|
| +++ b/net/base/keygen_handler_unittest.cc
|
| @@ -114,9 +114,7 @@ class ConcurrencyTestTask : public Task {
|
|
|
| // 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.
|
| -//
|
| -// Disabled because it crashes on Chrome OS. See http://crbug.com/47587
|
| -TEST_F(KeygenHandlerTest, DISABLED_ConcurrencyTest) {
|
| +TEST_F(KeygenHandlerTest, ConcurrencyTest) {
|
| const int NUM_HANDLERS = 5;
|
| base::WaitableEvent* events[NUM_HANDLERS] = { NULL };
|
| std::string results[NUM_HANDLERS];
|
|
|