Revert "Move mojo edk into mojo/edk"

ipc/mojo/run_all_unittests.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/at_exit.h"
 #include "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "mojo/edk/embedder/test_embedder.h"
+#include "mojo/embedder/test_embedder.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "base/test/test_file_util.h"
 #endif
 
 namespace {
 
 class NoAtExitBaseTestSuite : public base::TestSuite {
  public:
@@ skipping 13 matching lines @@
 #if defined(OS_ANDROID)
   JNIEnv* env = base::android::AttachCurrentThread();
   base::RegisterContentUriTestUtils(env);
 #else
   base::AtExitManager at_exit;
 #endif
   return base::LaunchUnitTestsSerially(argc,
                                        argv,
                                        base::Bind(&RunTestSuite, argc, argv));
 }