[mojo] Delete third_party/mojo

content/test/run_all_unittests.cc

Index: content/test/run_all_unittests.cc
diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc
index 8b403465909c159c9d0f004e8f0312ffa3c448e9..ac655a436ec0d1afa1ca8e88bd5108bf8af36e38 100644
--- a/content/test/run_all_unittests.cc
+++ b/content/test/run_all_unittests.cc
@@ -10,7 +10,7 @@
 #include "content/app/mojo/mojo_init.h"
 #include "content/public/test/unittest_test_suite.h"
 #include "content/test/content_test_suite.h"
-#include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h"
+#include "mojo/edk/test/scoped_ipc_support.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
@@ -28,11 +28,9 @@ int main(int argc, char** argv) {
 #if !defined(OS_IOS)
   content::InitializeMojo();
   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
-  scoped_ptr<mojo::test::ScopedIPCSupport> ipc_support;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
-    ipc_support.reset(new mojo::test::ScopedIPCSupport(
-        test_io_thread.task_runner()));
-  }
+  scoped_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support;
+  ipc_support.reset(
+      new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner()));
 #endif
 
   return base::LaunchUnitTests(