Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2385053002: Revert of Check that all shared workers are terminated. (patchset #2 id:170001 of https://c… (Closed)
Patch Set: fix merge conflict again Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/browser_process_sub_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 break; 1112 break;
1113 } 1113 }
1114 case BrowserThread::CACHE: { 1114 case BrowserThread::CACHE: {
1115 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:CacheThread"); 1115 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:CacheThread");
1116 ResetThread_CACHE(std::move(cache_thread_)); 1116 ResetThread_CACHE(std::move(cache_thread_));
1117 break; 1117 break;
1118 } 1118 }
1119 case BrowserThread::IO: { 1119 case BrowserThread::IO: {
1120 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:IOThread"); 1120 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:IOThread");
1121 ResetThread_IO(std::move(io_thread_)); 1121 ResetThread_IO(std::move(io_thread_));
1122
1123 // TODO(alokp): Remove after collecting crash data.
1124 // Temporary checks to verify that all shared workers are terminated.
1125 // It is suspected that shared workers prevent render process hosts
1126 // from shutting down: crbug.com/608049
1127 RenderProcessHostImpl::CheckAllWorkersTerminated();
1128 break; 1122 break;
1129 } 1123 }
1130 case BrowserThread::UI: 1124 case BrowserThread::UI:
1131 case BrowserThread::ID_COUNT: 1125 case BrowserThread::ID_COUNT:
1132 default: 1126 default:
1133 NOTREACHED(); 1127 NOTREACHED();
1134 break; 1128 break;
1135 } 1129 }
1136 } 1130 }
1137 { 1131 {
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1570 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1564 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1571 audio_thread_->task_runner(); 1565 audio_thread_->task_runner();
1572 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1566 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1573 std::move(worker_task_runner), 1567 std::move(worker_task_runner),
1574 MediaInternals::GetInstance()); 1568 MediaInternals::GetInstance());
1575 } 1569 }
1576 CHECK(audio_manager_); 1570 CHECK(audio_manager_);
1577 } 1571 }
1578 1572
1579 } // namespace content 1573 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_process_sub_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698