Revert "Move mojo edk into mojo/edk"

mojo/system/data_pipe.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/edk/system/data_pipe.h"
+#include "mojo/system/data_pipe.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <limits>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/memory.h"
-#include "mojo/edk/system/options_validation.h"
-#include "mojo/edk/system/waiter_list.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/memory.h"
+#include "mojo/system/options_validation.h"
+#include "mojo/system/waiter_list.h"
 
 namespace mojo {
 namespace system {
 
 // static
 const MojoCreateDataPipeOptions DataPipe::kDefaultCreateOptions = {
     static_cast<uint32_t>(sizeof(MojoCreateDataPipeOptions)),
     MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE, 1u,
     static_cast<uint32_t>(kDefaultDataPipeCapacityBytes)};
 
@@ skipping 436 matching lines @@
 void DataPipe::AwakeConsumerWaitersForStateChangeNoLock(
     const HandleSignalsState& new_consumer_state) {
   lock_.AssertAcquired();
   if (!has_local_consumer_no_lock())
     return;
   consumer_waiter_list_->AwakeWaitersForStateChange(new_consumer_state);
 }
 
 }  // namespace system
 }  // namespace mojo