Revert "Move mojo edk into mojo/edk"

mojo/system/data_pipe_consumer_dispatcher.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_consumer_dispatcher.h"
+#include "mojo/system/data_pipe_consumer_dispatcher.h"
 
 #include "base/logging.h"
-#include "mojo/edk/system/data_pipe.h"
-#include "mojo/edk/system/memory.h"
+#include "mojo/system/data_pipe.h"
+#include "mojo/system/memory.h"
 
 namespace mojo {
 namespace system {
 
 DataPipeConsumerDispatcher::DataPipeConsumerDispatcher() {
 }
 
 void DataPipeConsumerDispatcher::Init(scoped_refptr<DataPipe> data_pipe) {
   DCHECK(data_pipe.get());
   data_pipe_ = data_pipe;
@@ skipping 101 matching lines @@
   data_pipe_->ConsumerRemoveWaiter(waiter, signals_state);
 }
 
 bool DataPipeConsumerDispatcher::IsBusyNoLock() const {
   lock().AssertAcquired();
   return data_pipe_->ConsumerIsBusy();
 }
 
 }  // namespace system
 }  // namespace mojo