Mojo: Handle "nested" Shutdown() in RawChannelWin.

mojo/system/raw_channel_unittest.cc

 // Copyright 2014 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 "mojo/system/raw_channel.h"
 
 #include <stdint.h>
 
 #include <vector>
 
@@ skipping 567 matching lines @@
   }
 
  private:
   RawChannel* const raw_channel_;
   base::WaitableEvent done_event_;
   bool did_shutdown_;
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownOnReadMessageRawChannelDelegate);
 };
 
-// TODO(vtl): crbug.com/366768
-#if defined(OS_WIN)
-#define MAYBE_ShutdownOnReadMessage DISABLED_ShutdownOnReadMessage
-#else
-#define MAYBE_ShutdownOnReadMessage ShutdownOnReadMessage
-#endif
-TEST_F(RawChannelTest, MAYBE_ShutdownOnReadMessage) {
+TEST_F(RawChannelTest, ShutdownOnReadMessage) {
   // Write a few messages into the other end.
   for (size_t count = 0; count < 5; count++)
     EXPECT_TRUE(WriteTestMessageToHandle(handles[1].get(), 10));
 
   scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass()));
   ShutdownOnReadMessageRawChannelDelegate delegate(rc.get());
   io_thread()->PostTaskAndWait(FROM_HERE,
                                base::Bind(&InitOnIOThread, rc.get(),
                                           base::Unretained(&delegate)));
 
@@ skipping 35 matching lines @@
 
  private:
   RawChannel* const raw_channel_;
   const FatalError shutdown_on_error_type_;
   base::WaitableEvent done_event_;
   bool did_shutdown_;
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownOnFatalErrorRawChannelDelegate);
 };
 
-// TODO(vtl): crbug.com/366768
-#if defined(OS_WIN)
-#define MAYBE_ShutdownOnFatalErrorRead DISABLED_ShutdownOnFatalErrorRead
-#else
-#define MAYBE_ShutdownOnFatalErrorRead ShutdownOnFatalErrorRead
-#endif
-TEST_F(RawChannelTest, MAYBE_ShutdownOnFatalErrorRead) {
+TEST_F(RawChannelTest, ShutdownOnFatalErrorRead) {
   scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass()));
   ShutdownOnFatalErrorRawChannelDelegate delegate(
       rc.get(), RawChannel::Delegate::FATAL_ERROR_FAILED_READ);
   io_thread()->PostTaskAndWait(FROM_HERE,
                                base::Bind(&InitOnIOThread, rc.get(),
                                           base::Unretained(&delegate)));
 
   // Close the handle of the other end, which should stuff fail.
   handles[1].reset();
 
   // Wait for the delegate, which will shut the |RawChannel| down.
   delegate.Wait();
 }
 
-// TODO(vtl): crbug.com/366768
-#if defined(OS_WIN)
-#define MAYBE_ShutdownOnFatalErrorWrite DISABLED_ShutdownOnFatalErrorWrite
-#else
-#define MAYBE_ShutdownOnFatalErrorWrite ShutdownOnFatalErrorWrite
-#endif
-TEST_F(RawChannelTest, MAYBE_ShutdownOnFatalErrorWrite) {
+TEST_F(RawChannelTest, ShutdownOnFatalErrorWrite) {
   scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass()));
   ShutdownOnFatalErrorRawChannelDelegate delegate(
       rc.get(), RawChannel::Delegate::FATAL_ERROR_FAILED_WRITE);
   io_thread()->PostTaskAndWait(FROM_HERE,
                                base::Bind(&InitOnIOThread, rc.get(),
                                           base::Unretained(&delegate)));
 
   // Close the handle of the other end, which should stuff fail.
   handles[1].reset();
 
   EXPECT_FALSE(rc->WriteMessage(MakeTestMessage(1)));
 
   // Wait for the delegate, which will shut the |RawChannel| down.
   delegate.Wait();
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo