Mojo: Rename MOJO_WAIT_FLAG_... -> MOJO_HANDLE_SIGNAL_....

mojo/system/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/channel.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/embedder/platform_channel_pair.h"
@@ skipping 246 matching lines @@
   // an |AttachMessagePipeEndpoint()| (which is actually incorrect). We need to
   // refactor |AttachMessagePipeEndpoint()| to indicate whether |Run...()| will
   // necessarily be called or not. (Then, in the case that it may not be called,
   // we should test a |Shutdown()| without the |Run...()|.)
   EXPECT_TRUE(channel()->RunMessagePipeEndpoint(local_id,
                                                 Channel::kBootstrapEndpointId));
 
   Waiter waiter;
   waiter.Init();
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 123));
+            mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123));
 
   // Don't wait for the shutdown to run ...
   io_thread()->PostTask(FROM_HERE,
                         base::Bind(&ChannelTest::ShutdownChannelOnIOThread,
                                    base::Unretained(this)));
 
   // ... since this |Wait()| should fail once the channel is shut down.
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
             waiter.Wait(MOJO_DEADLINE_INDEFINITE, NULL));
   mp->RemoveWaiter(0, &waiter);
@@ skipping 30 matching lines @@
                                                 Channel::kBootstrapEndpointId));
 
   io_thread()->PostTaskAndWait(
       FROM_HERE,
       base::Bind(&ChannelTest::ShutdownChannelOnIOThread,
                  base::Unretained(this)));
 
   Waiter waiter;
   waiter.Init();
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
-            mp->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 123));
+            mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123));
 
   mp->Close(0);
 
   EXPECT_TRUE(channel()->HasOneRef());
 }
 
 // TODO(vtl): More. ------------------------------------------------------------
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo