Revert "Move mojo edk into mojo/edk"

mojo/system/local_data_pipe.h

 // 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_LOCAL_DATA_PIPE_H_
-#define MOJO_EDK_SYSTEM_LOCAL_DATA_PIPE_H_
+#ifndef MOJO_SYSTEM_LOCAL_DATA_PIPE_H_
+#define MOJO_SYSTEM_LOCAL_DATA_PIPE_H_
 
 #include "base/macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/data_pipe.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/data_pipe.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
 
 // |LocalDataPipe| is a subclass that "implements" |DataPipe| for data pipes
 // whose producer and consumer are both local. This class is thread-safe (with
 // protection provided by |DataPipe|'s |lock_|.
 class MOJO_SYSTEM_IMPL_EXPORT LocalDataPipe : public DataPipe {
  public:
   // |validated_options| should be the output of |DataPipe::ValidateOptions()|.
@@ skipping 58 matching lines @@
   // Circular buffer.
   size_t start_index_;
   size_t current_num_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalDataPipe);
 };
 
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_LOCAL_DATA_PIPE_H_
+#endif  // MOJO_SYSTEM_LOCAL_DATA_PIPE_H_