Revert "Move mojo edk into mojo/edk"

mojo/system/message_in_transit_queue.h

 // 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.
 
-#ifndef MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
+#ifndef MOJO_SYSTEM_MESSAGE_QUEUE_H_
+#define MOJO_SYSTEM_MESSAGE_QUEUE_H_
 
 #include <deque>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
 
 // A simple queue for |MessageInTransit|s (that owns its messages).
 // This class is not thread-safe.
 // TODO(vtl): Write tests.
 class MOJO_SYSTEM_IMPL_EXPORT MessageInTransitQueue {
  public:
   MessageInTransitQueue();
@@ skipping 27 matching lines @@
   // TODO(vtl): When C++11 is available, switch this to a deque of
   // |scoped_ptr|/|unique_ptr|s.
   std::deque<MessageInTransit*> queue_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageInTransitQueue);
 };
 
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
+#endif  // MOJO_SYSTEM_MESSAGE_QUEUE_H_