Stop linking in the old Mojo EDK.

content/test/content_test_suite.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/test/content_test_suite.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "gpu/config/gpu_util.h"
+#include "mojo/edk/embedder/embedder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/win/dpi.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #if !defined(OS_IOS)
 #include "base/test/mock_chrome_application_mac.h"
@@ skipping 35 matching lines @@
 
  private:
   content::TestContentClientInitializer* test_content_client_initializer_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInitializationListener);
 };
 
 }  // namespace
 
 ContentTestSuite::ContentTestSuite(int argc, char** argv)
-    : ContentTestSuiteBase(argc, argv) {
+    : ContentTestSuiteBase(argc, argv),
+      test_io_thread_(base::TestIOThread::kAutoStart) {
 }
 
 ContentTestSuite::~ContentTestSuite() {
 }
 
 void ContentTestSuite::Initialize() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #if !defined(OS_IOS)
   mock_cr_app::RegisterMockCrApp();
 #endif
 #endif
 
 #if defined(OS_WIN)
   gfx::SetDefaultDeviceScaleFactor(1.0f);
 #endif
 
   ContentTestSuiteBase::Initialize();
   {
     ContentClient client;
     ContentTestSuiteBase::RegisterContentSchemes(&client);
   }
   RegisterPathProvider();
+  mojo::edk::Init(test_io_thread_.task_runner());
 #if !defined(OS_IOS)
   media::InitializeMediaLibrary();
   // When running in a child process for Mac sandbox tests, the sandbox exists
   // to initialize GL, so don't do it here.
   bool is_child_process = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kTestChildProcess);
   if (!is_child_process) {
     gfx::GLSurfaceTestSupport::InitializeOneOff();
     gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess());
   }
@@ skipping 10 matching lines @@
     client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
     ui::ClientNativePixmapFactory::SetInstance(
         client_native_pixmap_factory_.get());
     ui::ClientNativePixmapFactory::GetInstance()->Initialize(
         ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice());
   }
 #endif
 }
 
 }  // namespace content