| Index: base/win/scoped_handle_unittest.cc
|
| diff --git a/base/win/scoped_handle_unittest.cc b/base/win/scoped_handle_unittest.cc
|
| index 2d90f9fcf34f693552ffcc62ba31111520d3a393..ca6fb451a876e3e249ae8526f083bcc7ce0f0ec3 100644
|
| --- a/base/win/scoped_handle_unittest.cc
|
| +++ b/base/win/scoped_handle_unittest.cc
|
| @@ -99,7 +99,15 @@ TEST(ScopedHandleTest, ActiveVerifierUntrackedHandle) {
|
| ASSERT_TRUE(::CloseHandle(handle));
|
| }
|
|
|
| -TEST(ScopedHandleTest, MultiProcess) {
|
| +// Under ASan, the multi-process test crashes during process shutdown for
|
| +// unknown reasons. Disable it for now. http://crbug.com/685262
|
| +#if defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_MultiProcess DISABLED_MultiProcess
|
| +#else
|
| +#define MAYBE_MultiProcess MultiProcess
|
| +#endif
|
| +
|
| +TEST(ScopedHandleTest, MAYBE_MultiProcess) {
|
| // Initializing ICU in the child process causes a scoped handle to be created
|
| // before the test gets a chance to test the race condition, so disable ICU
|
| // for the child process here.
|
|
|