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

mojo/spy/spy.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/spy/spy.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
@@ skipping 32 matching lines @@
     handle_count_[0] = 0;
     handle_count_[1] = 0;
   }
 
   void Start(mojo::ScopedMessagePipeHandle client,
              mojo::ScopedMessagePipeHandle interceptor) {
     std::vector<mojo::MessagePipeHandle> pipes;
     pipes.push_back(client.get());
     pipes.push_back(interceptor.get());
     std::vector<MojoHandleSignals> handle_signals;
-    handle_signals.push_back(MOJO_WAIT_FLAG_READABLE);
-    handle_signals.push_back(MOJO_WAIT_FLAG_READABLE);
+    handle_signals.push_back(MOJO_HANDLE_SIGNAL_READABLE);
+    handle_signals.push_back(MOJO_HANDLE_SIGNAL_READABLE);
 
     scoped_ptr<char[]> mbuf(new char[kMessageBufSize]);
     scoped_ptr<MojoHandle[]> hbuf(new MojoHandle[kHandleBufSize]);
 
     // Main processing loop:
     // 1- Wait for an endpoint to have a message.
     // 2- Read the message
     // 3- Log data
     // 4- Wait until the opposite port is ready for writting
     // 4- Write the message to opposite port.
@@ skipping 18 matching lines @@
         continue;
 
       if (handles_read)
         handle_count_[r] += handles_read;
 
       ++message_count_[r];
       bytes_transfered_ += bytes_read;
 
       mojo::MessagePipeHandle write_handle = (r == 0) ? pipes[1] : pipes[0];
       if (!CheckResult(Wait(write_handle,
-                            MOJO_WAIT_FLAG_WRITABLE,
+                            MOJO_HANDLE_SIGNAL_WRITABLE,
                             MOJO_DEADLINE_INDEFINITE)))
         break;
 
       if (!CheckResult(WriteMessageRaw(write_handle,
                                        mbuf.get(), bytes_read,
                                        hbuf.get(), handles_read,
                                        MOJO_WRITE_MESSAGE_FLAG_NONE))) {
         // On failure we own the handles. For now just close them.
         if (handles_read)
           CloseHandles(hbuf.get(), handles_read);
@@ skipping 102 matching lines @@
   // Start intercepting mojo services.
   service_manager->SetInterceptor(new SpyInterceptor());
 }
 
 Spy::~Spy(){
   // TODO(cpu): Do not leak the interceptor. Lifetime between the
   // service_manager and the spy is still unclear hence the leak.
 }
 
 }  // namespace mojo