Revert of Mojo EDK: Introduce MojoQueryHandleSignalsState API

mojo/android/system/src/org/chromium/mojo/system/impl/HandleBase.java

 // 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.
 
 package org.chromium.mojo.system.impl;
 
 import android.util.Log;
 
 import org.chromium.mojo.system.Core;
-import org.chromium.mojo.system.Core.HandleSignalsState;
+import org.chromium.mojo.system.Core.HandleSignals;
+import org.chromium.mojo.system.Core.WaitResult;
 import org.chromium.mojo.system.Handle;
 import org.chromium.mojo.system.UntypedHandle;
 
 /**
  * Implementation of {@link Handle}.
  */
 abstract class HandleBase implements Handle {
 
     private static final String TAG = "HandleImpl";
 
@@ skipping 34 matching lines @@
     public void close() {
         if (mMojoHandle != CoreImpl.INVALID_HANDLE) {
             // After a close, the handle is invalid whether the close succeed or not.
             int handle = mMojoHandle;
             mMojoHandle = CoreImpl.INVALID_HANDLE;
             mCore.close(handle);
         }
     }
 
     /**
-     * @see org.chromium.mojo.system.Handle#querySignalsState()
+     * @see org.chromium.mojo.system.Handle#wait(HandleSignals, long)
      */
     @Override
-    public HandleSignalsState querySignalsState() {
-        return mCore.queryHandleSignalsState(mMojoHandle);
+    public WaitResult wait(HandleSignals signals, long deadline) {
+        return mCore.wait(this, signals, deadline);
     }
 
     /**
      * @see org.chromium.mojo.system.Handle#isValid()
      */
     @Override
     public boolean isValid() {
         return mMojoHandle != CoreImpl.INVALID_HANDLE;
     }
 
@@ skipping 51 matching lines @@
             // This should not happen, as the user of this class should close the handle. Adding a
             // warning.
             Log.w(TAG, "Handle was not closed.");
             // Ignore result at this point.
             mCore.closeWithResult(mMojoHandle);
         }
         super.finalize();
     }
 
 }