| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 | 778 |
| 779 return result_code_; | 779 return result_code_; |
| 780 } | 780 } |
| 781 | 781 |
| 782 void BrowserMainLoop::CreateStartupTasks() { | 782 void BrowserMainLoop::CreateStartupTasks() { |
| 783 TRACE_EVENT0("startup", "BrowserMainLoop::CreateStartupTasks"); | 783 TRACE_EVENT0("startup", "BrowserMainLoop::CreateStartupTasks"); |
| 784 | 784 |
| 785 // First time through, we really want to create all the tasks | 785 // First time through, we really want to create all the tasks |
| 786 if (!startup_task_runner_.get()) { | 786 if (!startup_task_runner_.get()) { |
| 787 #if defined(OS_ANDROID) | 787 #if defined(OS_ANDROID) |
| 788 startup_task_runner_ = base::WrapUnique( | 788 startup_task_runner_ = base::MakeUnique<StartupTaskRunner>( |
| 789 new StartupTaskRunner(base::Bind(&BrowserStartupComplete), | 789 base::Bind(&BrowserStartupComplete), |
| 790 base::ThreadTaskRunnerHandle::Get())); | 790 base::ThreadTaskRunnerHandle::Get()); |
| 791 #else | 791 #else |
| 792 startup_task_runner_ = base::WrapUnique(new StartupTaskRunner( | 792 startup_task_runner_ = base::MakeUnique<StartupTaskRunner>( |
| 793 base::Callback<void(int)>(), base::ThreadTaskRunnerHandle::Get())); | 793 base::Callback<void(int)>(), base::ThreadTaskRunnerHandle::Get()); |
| 794 #endif | 794 #endif |
| 795 StartupTask pre_create_threads = | 795 StartupTask pre_create_threads = |
| 796 base::Bind(&BrowserMainLoop::PreCreateThreads, base::Unretained(this)); | 796 base::Bind(&BrowserMainLoop::PreCreateThreads, base::Unretained(this)); |
| 797 startup_task_runner_->AddTask(pre_create_threads); | 797 startup_task_runner_->AddTask(pre_create_threads); |
| 798 | 798 |
| 799 StartupTask create_threads = | 799 StartupTask create_threads = |
| 800 base::Bind(&BrowserMainLoop::CreateThreads, base::Unretained(this)); | 800 base::Bind(&BrowserMainLoop::CreateThreads, base::Unretained(this)); |
| 801 startup_task_runner_->AddTask(create_threads); | 801 startup_task_runner_->AddTask(create_threads); |
| 802 | 802 |
| 803 StartupTask browser_thread_started = base::Bind( | 803 StartupTask browser_thread_started = base::Bind( |
| (...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1539 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1539 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1540 audio_thread_->task_runner(); | 1540 audio_thread_->task_runner(); |
| 1541 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1541 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1542 std::move(worker_task_runner), | 1542 std::move(worker_task_runner), |
| 1543 MediaInternals::GetInstance()); | 1543 MediaInternals::GetInstance()); |
| 1544 } | 1544 } |
| 1545 CHECK(audio_manager_); | 1545 CHECK(audio_manager_); |
| 1546 } | 1546 } |
| 1547 | 1547 |
| 1548 } // namespace content | 1548 } // namespace content |
| OLD | NEW |