Mojo: re-org public/utility and public/environment

mojo/public/tests/environment/async_waiter_unittest.cc

Index: mojo/public/tests/environment/async_waiter_unittest.cc
diff --git a/mojo/public/tests/environment/async_waiter_unittest.cc b/mojo/public/tests/environment/async_waiter_unittest.cc
deleted file mode 100644
index 9dfbecc314f63ffa455638bc4fbd77217801301c..0000000000000000000000000000000000000000
--- a/mojo/public/tests/environment/async_waiter_unittest.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-// 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/public/environment/default_async_waiter.h"
-
-#include "mojo/public/environment/environment.h"
-#include "mojo/public/system/core_cpp.h"
-#include "mojo/public/system/macros.h"
-#include "mojo/public/tests/test_support.h"
-#include "mojo/public/utility/run_loop.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace mojo {
-namespace {
-
-class TestAsyncWaitCallback {
- public:
-  TestAsyncWaitCallback() : result_count_(0), last_result_(MOJO_RESULT_OK) {
-  }
-  virtual ~TestAsyncWaitCallback() {}
-
-  int result_count() const { return result_count_; }
-
-  MojoResult last_result() const { return last_result_; }
-
-  // MojoAsyncWaitCallback:
-  static void OnHandleReady(void* closure, MojoResult result) {
-    TestAsyncWaitCallback* self = static_cast<TestAsyncWaitCallback*>(closure);
-    self->result_count_++;
-    self->last_result_ = result;
-  }
-
- private:
-  int result_count_;
-  MojoResult last_result_;
-
-  MOJO_DISALLOW_COPY_AND_ASSIGN(TestAsyncWaitCallback);
-};
-
-MojoAsyncWaitID CallAsyncWait(const Handle& handle,
-                              MojoWaitFlags flags,
-                              TestAsyncWaitCallback* callback) {
-  MojoAsyncWaiter* waiter = GetDefaultAsyncWaiter();
-  return waiter->AsyncWait(waiter,
-                           handle.value(),
-                           flags,
-                           MOJO_DEADLINE_INDEFINITE,
-                           &TestAsyncWaitCallback::OnHandleReady,
-                           callback);
-}
-
-void CallCancelWait(MojoAsyncWaitID wait_id) {
-  MojoAsyncWaiter* waiter = GetDefaultAsyncWaiter();
-  waiter->CancelWait(waiter, wait_id);
-}
-
-class AsyncWaiterTest : public testing::Test {
- public:
-  AsyncWaiterTest() {}
-
- private:
-  Environment environment_;
-  RunLoop run_loop_;
-
-  MOJO_DISALLOW_COPY_AND_ASSIGN(AsyncWaiterTest);
-};
-
-// Verifies AsyncWaitCallback is notified when pipe is ready.
-TEST_F(AsyncWaiterTest, CallbackNotified) {
-  TestAsyncWaitCallback callback;
-  MessagePipe test_pipe;
-  EXPECT_EQ(MOJO_RESULT_OK,
-            test::WriteEmptyMessage(test_pipe.handle1.get()));
-
-  CallAsyncWait(test_pipe.handle0.get(),
-                MOJO_WAIT_FLAG_READABLE,
-                &callback);
-  RunLoop::current()->Run();
-  EXPECT_EQ(1, callback.result_count());
-  EXPECT_EQ(MOJO_RESULT_OK, callback.last_result());
-}
-
-// Verifies 2 AsyncWaitCallbacks are notified when there pipes are ready.
-TEST_F(AsyncWaiterTest, TwoCallbacksNotified) {
-  TestAsyncWaitCallback callback1;
-  TestAsyncWaitCallback callback2;
-  MessagePipe test_pipe1;
-  MessagePipe test_pipe2;
-  EXPECT_EQ(MOJO_RESULT_OK,
-            test::WriteEmptyMessage(test_pipe1.handle1.get()));
-  EXPECT_EQ(MOJO_RESULT_OK,
-            test::WriteEmptyMessage(test_pipe2.handle1.get()));
-
-  CallAsyncWait(test_pipe1.handle0.get(), MOJO_WAIT_FLAG_READABLE, &callback1);
-  CallAsyncWait(test_pipe2.handle0.get(), MOJO_WAIT_FLAG_READABLE, &callback2);
-
-  RunLoop::current()->Run();
-  EXPECT_EQ(1, callback1.result_count());
-  EXPECT_EQ(MOJO_RESULT_OK, callback1.last_result());
-  EXPECT_EQ(1, callback2.result_count());
-  EXPECT_EQ(MOJO_RESULT_OK, callback2.last_result());
-}
-
-// Verifies cancel works.
-TEST_F(AsyncWaiterTest, CancelCallback) {
-  TestAsyncWaitCallback callback;
-  MessagePipe test_pipe;
-  EXPECT_EQ(MOJO_RESULT_OK, test::WriteEmptyMessage(test_pipe.handle1.get()));
-
-  CallCancelWait(
-      CallAsyncWait(test_pipe.handle0.get(),
-                    MOJO_WAIT_FLAG_READABLE,
-                    &callback));
-  RunLoop::current()->Run();
-  EXPECT_EQ(0, callback.result_count());
-}
-
-}  // namespace
-}  // namespace mojo