| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/test/base/mojo_test_connector.h" | 5 #include "chrome/test/base/mojo_test_connector.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "base/callback.h" | 8 #include "base/callback.h" | 
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" | 
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" | 
| 11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" | 
| 12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" | 
| 13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" | 
| 14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" | 
| 15 #include "base/synchronization/waitable_event.h" | 15 #include "base/synchronization/waitable_event.h" | 
| 16 #include "base/threading/thread.h" | 16 #include "base/threading/thread.h" | 
|  | 17 #include "base/threading/thread_task_runner_handle.h" | 
| 17 #include "content/public/common/content_switches.h" | 18 #include "content/public/common/content_switches.h" | 
| 18 #include "content/public/test/test_launcher.h" | 19 #include "content/public/test/test_launcher.h" | 
| 19 #include "mojo/edk/embedder/embedder.h" | 20 #include "mojo/edk/embedder/embedder.h" | 
| 20 #include "mojo/edk/embedder/platform_channel_pair.h" | 21 #include "mojo/edk/embedder/platform_channel_pair.h" | 
| 21 #include "mojo/edk/embedder/scoped_ipc_support.h" | 22 #include "mojo/edk/embedder/scoped_ipc_support.h" | 
| 22 #include "mojo/public/cpp/bindings/interface_request.h" | 23 #include "mojo/public/cpp/bindings/interface_request.h" | 
| 23 #include "services/catalog/store.h" | 24 #include "services/catalog/store.h" | 
| 24 #include "services/service_manager/background/background_service_manager.h" | 25 #include "services/service_manager/background/background_service_manager.h" | 
| 25 #include "services/service_manager/public/cpp/connector.h" | 26 #include "services/service_manager/public/cpp/connector.h" | 
| 26 #include "services/service_manager/public/cpp/service.h" | 27 #include "services/service_manager/public/cpp/service.h" | 
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 204 MojoTestConnector::~MojoTestConnector() {} | 205 MojoTestConnector::~MojoTestConnector() {} | 
| 205 | 206 | 
| 206 std::unique_ptr<content::TestState> MojoTestConnector::PrepareForTest( | 207 std::unique_ptr<content::TestState> MojoTestConnector::PrepareForTest( | 
| 207     base::CommandLine* command_line, | 208     base::CommandLine* command_line, | 
| 208     base::TestLauncher::LaunchOptions* test_launch_options) { | 209     base::TestLauncher::LaunchOptions* test_launch_options) { | 
| 209   auto test_state = | 210   auto test_state = | 
| 210       base::MakeUnique<MojoTestState>(&background_service_manager_); | 211       base::MakeUnique<MojoTestState>(&background_service_manager_); | 
| 211   test_state->Init(command_line, test_launch_options); | 212   test_state->Init(command_line, test_launch_options); | 
| 212   return test_state; | 213   return test_state; | 
| 213 } | 214 } | 
| OLD | NEW | 
|---|