Stop linking in the old Mojo EDK.

content/public/test/render_view_test.cc

 // Copyright (c) 2012 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 "content/public/test/render_view_test.h"
 
 #include <stddef.h>
 
 #include <cctype>
 
@@ skipping 350 matching lines @@
   view_params.hidden = false;
   view_params.never_visible = false;
   view_params.next_page_id = 1;
   view_params.initial_size = *InitialSizeParams();
   view_params.enable_auto_resize = false;
   view_params.min_size = gfx::Size();
   view_params.max_size = gfx::Size();
 
 #if !defined(OS_IOS)
   InitializeMojo();
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
-    test_io_thread_.reset(new base::TestIOThread(
-        base::TestIOThread::kAutoStart));
-    ipc_support_.reset(new mojo::test::ScopedIPCSupport(
-        test_io_thread_->task_runner()));
-  }
+  test_io_thread_.reset(new base::TestIOThread(
+      base::TestIOThread::kAutoStart));
+  ipc_support_.reset(new mojo::edk::test::ScopedIPCSupport(
+      test_io_thread_->task_runner()));
 #endif
 
   // This needs to pass the mock render thread to the view.
   RenderViewImpl* view =
       RenderViewImpl::Create(compositor_deps_.get(), view_params, false);
   view_ = view;
 }
 
 void RenderViewTest::TearDown() {
   // Run the loop so the release task from the renderwidget executes.
@@ skipping 328 matching lines @@
   TestRenderFrame* frame =
       static_cast<TestRenderFrame*>(impl->GetMainRenderFrame());
   frame->Navigate(common_params, StartNavigationParams(), request_params);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   FrameLoadWaiter(frame).Wait();
 }
 
 }  // namespace content