Revert "Move mojo edk into mojo/edk"

mojo/edk/system/waiter_test_utils.h

Index: mojo/edk/system/waiter_test_utils.h
diff --git a/mojo/edk/system/waiter_test_utils.h b/mojo/edk/system/waiter_test_utils.h
deleted file mode 100644
index 25e5344fc6bac0a0e6191af5c3b0b5cdef9e507a..0000000000000000000000000000000000000000
--- a/mojo/edk/system/waiter_test_utils.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// 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_EDK_SYSTEM_WAITER_TEST_UTILS_H_
-#define MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_
-
-#include <stdint.h>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/threading/simple_thread.h"
-#include "mojo/edk/system/dispatcher.h"
-#include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/waiter.h"
-#include "mojo/public/c/system/types.h"
-
-namespace mojo {
-namespace system {
-namespace test {
-
-// This is a very simple thread that has a |Waiter|, on which it waits
-// indefinitely (and records the result). It will create and initialize the
-// |Waiter| on creation, but the caller must start the thread with |Start()|. It
-// will join the thread on destruction.
-//
-// One usually uses it like:
-//
-//    MojoResult result;
-//    {
-//      WaiterList waiter_list;
-//      test::SimpleWaiterThread thread(&result);
-//      waiter_list.AddWaiter(thread.waiter(), ...);
-//      thread.Start();
-//      ... some stuff to wake the waiter ...
-//      waiter_list.RemoveWaiter(thread.waiter());
-//    }  // Join |thread|.
-//    EXPECT_EQ(..., result);
-//
-// There's a bit of unrealism in its use: In this sort of usage, calls such as
-// |Waiter::Init()|, |AddWaiter()|, and |RemoveWaiter()| are done in the main
-// (test) thread, not the waiter thread (as would actually happen in real code).
-// (We accept this unrealism for simplicity, since |WaiterList| is
-// thread-unsafe so making it more realistic would require adding nontrivial
-// synchronization machinery.)
-class SimpleWaiterThread : public base::SimpleThread {
- public:
-  // For the duration of the lifetime of this object, |*result| belongs to it
-  // (in the sense that it will write to it whenever it wants).
-  SimpleWaiterThread(MojoResult* result, uint32_t* context);
-  virtual ~SimpleWaiterThread();  // Joins the thread.
-
-  Waiter* waiter() { return &waiter_; }
-
- private:
-  virtual void Run() override;
-
-  MojoResult* const result_;
-  uint32_t* const context_;
-  Waiter waiter_;
-
-  DISALLOW_COPY_AND_ASSIGN(SimpleWaiterThread);
-};
-
-// This is a more complex and realistic thread that has a |Waiter|, on which it
-// waits for the given deadline (with the given flags). Unlike
-// |SimpleWaiterThread|, it requires the machinery of |Dispatcher|.
-class WaiterThread : public base::SimpleThread {
- public:
-  // Note: |*did_wait_out|, |*result_out|, |*context_out| and
-  // |*signals_state_out| "belong" to this object (i.e., may be modified by, on
-  // some other thread) while it's alive.
-  WaiterThread(scoped_refptr<Dispatcher> dispatcher,
-               MojoHandleSignals handle_signals,
-               MojoDeadline deadline,
-               uint32_t context,
-               bool* did_wait_out,
-               MojoResult* result_out,
-               uint32_t* context_out,
-               HandleSignalsState* signals_state_out);
-  virtual ~WaiterThread();
-
- private:
-  virtual void Run() override;
-
-  const scoped_refptr<Dispatcher> dispatcher_;
-  const MojoHandleSignals handle_signals_;
-  const MojoDeadline deadline_;
-  const uint32_t context_;
-  bool* const did_wait_out_;
-  MojoResult* const result_out_;
-  uint32_t* const context_out_;
-  HandleSignalsState* const signals_state_out_;
-
-  Waiter waiter_;
-
-  DISALLOW_COPY_AND_ASSIGN(WaiterThread);
-};
-
-}  // namespace test
-}  // namespace system
-}  // namespace mojo
-
-#endif  // MOJO_EDK_SYSTEM_WAITER_TEST_UTILS_H_