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

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

Issue 2338113002: Revert "Reland of Check that all shared workers are terminated. (patchset #2 id:170001 of https://c… (Closed)
Patch Set: Created 4 years, 3 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 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 break; 1089 break;
1090 } 1090 }
1091 case BrowserThread::CACHE: { 1091 case BrowserThread::CACHE: {
1092 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:CacheThread"); 1092 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:CacheThread");
1093 ResetThread_CACHE(std::move(cache_thread_)); 1093 ResetThread_CACHE(std::move(cache_thread_));
1094 break; 1094 break;
1095 } 1095 }
1096 case BrowserThread::IO: { 1096 case BrowserThread::IO: {
1097 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:IOThread"); 1097 TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:IOThread");
1098 ResetThread_IO(std::move(io_thread_)); 1098 ResetThread_IO(std::move(io_thread_));
1099
1100 // TODO(alokp): Remove after collecting crash data.
1101 // Temporary checks to verify that all shared workers are terminated.
1102 // It is suspected that shared workers prevent render process hosts
1103 // from shutting down: crbug.com/608049
1104 RenderProcessHostImpl::CheckAllWorkersTerminated();
1105 break; 1099 break;
1106 } 1100 }
1107 case BrowserThread::UI: 1101 case BrowserThread::UI:
1108 case BrowserThread::ID_COUNT: 1102 case BrowserThread::ID_COUNT:
1109 default: 1103 default:
1110 NOTREACHED(); 1104 NOTREACHED();
1111 break; 1105 break;
1112 } 1106 }
1113 } 1107 }
1114 { 1108 {
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1546 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1540 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1547 audio_thread_->task_runner(); 1541 audio_thread_->task_runner();
1548 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1542 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1549 std::move(worker_task_runner), 1543 std::move(worker_task_runner),
1550 MediaInternals::GetInstance()); 1544 MediaInternals::GetInstance());
1551 } 1545 }
1552 CHECK(audio_manager_); 1546 CHECK(audio_manager_);
1553 } 1547 }
1554 1548
1555 } // namespace content 1549 } // 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