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

mojo/system/dispatcher_unittest.cc

 // Copyright 2013 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/dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 46 matching lines @@
             d->EndWriteData(0));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->ReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->BeginReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->EndReadData(0));
   Waiter w;
   w.Init();
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
-            d->AddWaiter(&w, MOJO_WAIT_FLAG_EVERYTHING, 0));
+            d->AddWaiter(&w, ~MOJO_HANDLE_SIGNAL_NONE, 0));
   // Okay to remove even if it wasn't added (or was already removed).
   d->RemoveWaiter(&w);
   d->RemoveWaiter(&w);
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->WriteMessage(NULL, 0, NULL, MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->ReadMessage(NULL, NULL, NULL, NULL,
                            MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->WriteData(NULL, NULL, MOJO_WRITE_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->BeginWriteData(NULL, NULL, MOJO_WRITE_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->EndWriteData(0));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->ReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->BeginReadData(NULL, NULL, MOJO_READ_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->EndReadData(0));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->AddWaiter(&w, MOJO_WAIT_FLAG_EVERYTHING, 0));
+            d->AddWaiter(&w, ~MOJO_HANDLE_SIGNAL_NONE, 0));
   d->RemoveWaiter(&w);
 }
 
 class ThreadSafetyStressThread : public base::SimpleThread {
  public:
   enum DispatcherOp {
     CLOSE = 0,
     WRITE_MESSAGE,
     READ_MESSAGE,
     WRITE_DATA,
@@ skipping 82 matching lines @@
       }
       case MAP_BUFFER: {
         scoped_ptr<RawSharedBufferMapping> unused;
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
                   dispatcher_->MapBuffer(0u, 0u, MOJO_MAP_BUFFER_FLAG_NONE,
                                          &unused));
         break;
       }
       case ADD_WAITER: {
         MojoResult r = dispatcher_->AddWaiter(&waiter_,
-                                              MOJO_WAIT_FLAG_EVERYTHING, 0);
+                                              ~MOJO_HANDLE_SIGNAL_NONE, 0);
         EXPECT_TRUE(r == MOJO_RESULT_FAILED_PRECONDITION ||
                     r == MOJO_RESULT_INVALID_ARGUMENT);
         break;
       }
       case REMOVE_WAITER:
         dispatcher_->RemoveWaiter(&waiter_);
         break;
       default:
         NOTREACHED();
         break;
@@ skipping 59 matching lines @@
       event.Signal();  // Kicks off real work on the threads.
     }  // Joins all the threads.
 
     EXPECT_EQ(MOJO_RESULT_OK, d->Close());
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo