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

Unified Diff: extensions/shell/browser/shell_browser_main_parts.cc

Issue 2630443003: Add thread checks to NaClBrowser, and make it leaky (Closed)
Patch Set: Update NaClGdbDebugStubTest Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: extensions/shell/browser/shell_browser_main_parts.cc
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index 58bdcf5e61d9ede31b28e4be6d151126b4031727..dd953675168502a4501e000adde18d8d7af7600c 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -203,9 +203,8 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
cmd->GetSwitchValueASCII(switches::kAppShellRefreshToken)));
#if !defined(DISABLE_NACL)
- // Takes ownership.
nacl::NaClBrowser::SetDelegate(
- new ShellNaClBrowserDelegate(browser_context_.get()));
+ base::MakeUnique<ShellNaClBrowserDelegate>(browser_context_.get()));
// Track the task so it can be canceled if app_shell shuts down very quickly,
// such as in browser tests.
task_tracker_.PostTask(
@@ -242,7 +241,6 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
#if !defined(DISABLE_NACL)
task_tracker_.TryCancelAll();
- nacl::NaClBrowser::SetDelegate(nullptr);
#endif
oauth2_token_service_.reset();

Powered by Google App Engine
This is Rietveld 408576698