Revert "Move mojo edk into mojo/edk"

ipc/mojo/ipc_mojo_perftest.cc

 // 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.
 
 #include "base/lazy_instance.h"
 #include "ipc/ipc_perftest_support.h"
 #include "ipc/mojo/ipc_channel_mojo.h"
 #include "ipc/mojo/ipc_channel_mojo_host.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 namespace {
 
 // This is needed because we rely on //base/test:test_support_perf and
 // it provides main() which doesn't have Mojo initialization.  We need
 // some way to call InitWithSimplePlatformSupport() only once before
 // using Mojo.
 struct MojoInitialier {
   MojoInitialier() {
     mojo::embedder::test::InitWithSimplePlatformSupport();
@@ skipping 69 matching lines @@
                                IPC::Channel::MODE_CLIENT,
                                listener));
 }
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(PerformanceClient) {
   MojoTestClient client;
   return client.RunMain();
 }
 
 }  // namespace