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

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

Issue 2254963002: Revert of Check that all shared workers are terminated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manually create the revert CL Created 4 years, 4 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 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 break; 1096 break;
1097 } 1097 }
1098 case BrowserThread::CACHE: { 1098 case BrowserThread::CACHE: {
1099 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:CacheThread"); 1099 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:CacheThread");
1100 ResetThread_CACHE(std::move(cache_thread_)); 1100 ResetThread_CACHE(std::move(cache_thread_));
1101 break; 1101 break;
1102 } 1102 }
1103 case BrowserThread::IO: { 1103 case BrowserThread::IO: {
1104 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:IOThread"); 1104 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:IOThread");
1105 ResetThread_IO(std::move(io_thread_)); 1105 ResetThread_IO(std::move(io_thread_));
1106
1107 // TODO(alokp): Remove after collecting crash data.
1108 // Temporary checks to verify that all shared workers are terminated.
1109 // It is suspected that shared workers prevent render process hosts
1110 // from shutting down: crbug.com/608049
1111 RenderProcessHostImpl::CheckAllWorkersTerminated();
1112 break; 1106 break;
1113 } 1107 }
1114 case BrowserThread::UI: 1108 case BrowserThread::UI:
1115 case BrowserThread::ID_COUNT: 1109 case BrowserThread::ID_COUNT:
1116 default: 1110 default:
1117 NOTREACHED(); 1111 NOTREACHED();
1118 break; 1112 break;
1119 } 1113 }
1120 } 1114 }
1121 { 1115 {
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1539 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1533 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1540 audio_thread_->task_runner(); 1534 audio_thread_->task_runner();
1541 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1535 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1542 std::move(worker_task_runner), 1536 std::move(worker_task_runner),
1543 MediaInternals::GetInstance()); 1537 MediaInternals::GetInstance());
1544 } 1538 }
1545 CHECK(audio_manager_); 1539 CHECK(audio_manager_);
1546 } 1540 }
1547 1541
1548 } // namespace content 1542 } // 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