Mojo: Wrap the satisfied/unsatisfied wait flags state in a single object.

mojo/system/data_pipe.h

 // 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.
 
 #ifndef MOJO_SYSTEM_DATA_PIPE_H_
 #define MOJO_SYSTEM_DATA_PIPE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/system/system_impl_export.h"
+#include "mojo/system/wait_flags_state.h"
 
 namespace mojo {
 namespace system {
 
 class Waiter;
 class WaiterList;
 
 // |DataPipe| is a base class for secondary objects implementing data pipes,
 // similar to |MessagePipe| (see the explanatory comment in core.cc). It is
 // typically owned by the dispatcher(s) corresponding to the local endpoints.
@@ skipping 73 matching lines @@
   virtual MojoResult ProducerWriteDataImplNoLock(const void* elements,
                                                  uint32_t* num_bytes,
                                                  bool all_or_none) = 0;
   virtual MojoResult ProducerBeginWriteDataImplNoLock(
       void** buffer,
       uint32_t* buffer_num_bytes,
       bool all_or_none) = 0;
   virtual MojoResult ProducerEndWriteDataImplNoLock(
       uint32_t num_bytes_written) = 0;
   // Note: A producer should not be writable during a two-phase write.
-  virtual MojoWaitFlags ProducerSatisfiedFlagsNoLock() = 0;
-  virtual MojoWaitFlags ProducerSatisfiableFlagsNoLock() = 0;
+  virtual WaitFlagsState ProducerGetWaitFlagsStateNoLock() const = 0;
 
   virtual void ConsumerCloseImplNoLock() = 0;
   // |*num_bytes| will be a nonzero multiple of |element_num_bytes_|.
   virtual MojoResult ConsumerReadDataImplNoLock(void* elements,
                                                 uint32_t* num_bytes,
                                                 bool all_or_none) = 0;
   virtual MojoResult ConsumerDiscardDataImplNoLock(uint32_t* num_bytes,
                                                    bool all_or_none) = 0;
   // |*num_bytes| will be a nonzero multiple of |element_num_bytes_|.
   virtual MojoResult ConsumerQueryDataImplNoLock(uint32_t* num_bytes) = 0;
   virtual MojoResult ConsumerBeginReadDataImplNoLock(const void** buffer,
                                                      uint32_t* buffer_num_bytes,
                                                      bool all_or_none) = 0;
   virtual MojoResult ConsumerEndReadDataImplNoLock(uint32_t num_bytes_read) = 0;
   // Note: A consumer should not be writable during a two-phase read.
-  virtual MojoWaitFlags ConsumerSatisfiedFlagsNoLock() = 0;
-  virtual MojoWaitFlags ConsumerSatisfiableFlagsNoLock() = 0;
+  virtual WaitFlagsState ConsumerGetWaitFlagsStateNoLock() const = 0;
 
   // Thread-safe and fast (they don't take the lock):
   bool may_discard() const { return may_discard_; }
   size_t element_num_bytes() const { return element_num_bytes_; }
   size_t capacity_num_bytes() const { return capacity_num_bytes_; }
 
   // Must be called under lock.
   bool producer_open_no_lock() const {
     lock_.AssertAcquired();
     return producer_open_;
@@ skipping 56 matching lines @@
   uint32_t producer_two_phase_max_num_bytes_written_;
   uint32_t consumer_two_phase_max_num_bytes_read_;
 
   DISALLOW_COPY_AND_ASSIGN(DataPipe);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_DATA_PIPE_H_