| 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 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1072 ResetThread_PROCESS_LAUNCHER(std::move(process_launcher_thread_)); | 1072 ResetThread_PROCESS_LAUNCHER(std::move(process_launcher_thread_)); |
| 1073 break; | 1073 break; |
| 1074 } | 1074 } |
| 1075 case BrowserThread::CACHE: { | 1075 case BrowserThread::CACHE: { |
| 1076 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:CacheThread"); | 1076 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:CacheThread"); |
| 1077 ResetThread_CACHE(std::move(cache_thread_)); | 1077 ResetThread_CACHE(std::move(cache_thread_)); |
| 1078 break; | 1078 break; |
| 1079 } | 1079 } |
| 1080 case BrowserThread::IO: { | 1080 case BrowserThread::IO: { |
| 1081 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:IOThread"); | 1081 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:IOThread"); |
| 1082 // At this point we should have removed all tabs which will lead to all | |
| 1083 // RenderProcessHostImpl instances getting terminated. | |
| 1084 // It is suspected that this is not happening: crbug.com/608049. | |
| 1085 // TODO(alokp): Remove this after fixing the issue. | |
| 1086 RenderProcessHostImpl::CheckAllTerminated(); | |
| 1087 ResetThread_IO(std::move(io_thread_)); | 1082 ResetThread_IO(std::move(io_thread_)); |
| 1088 break; | 1083 break; |
| 1089 } | 1084 } |
| 1090 case BrowserThread::UI: | 1085 case BrowserThread::UI: |
| 1091 case BrowserThread::ID_COUNT: | 1086 case BrowserThread::ID_COUNT: |
| 1092 default: | 1087 default: |
| 1093 NOTREACHED(); | 1088 NOTREACHED(); |
| 1094 break; | 1089 break; |
| 1095 } | 1090 } |
| 1096 } | 1091 } |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1512 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1507 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1513 audio_thread_->task_runner(); | 1508 audio_thread_->task_runner(); |
| 1514 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1509 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1515 std::move(worker_task_runner), | 1510 std::move(worker_task_runner), |
| 1516 MediaInternals::GetInstance()); | 1511 MediaInternals::GetInstance()); |
| 1517 } | 1512 } |
| 1518 CHECK(audio_manager_); | 1513 CHECK(audio_manager_); |
| 1519 } | 1514 } |
| 1520 | 1515 |
| 1521 } // namespace content | 1516 } // namespace content |
| OLD | NEW |