Add thread checks to NaClBrowser, and make it leaky

extensions/shell/browser/shell_browser_main_parts.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/shell/browser/shell_browser_main_parts.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
@@ skipping 185 matching lines @@
       browser_context_.get());
 
   // Initialize OAuth2 support from command line.
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   oauth2_token_service_.reset(new ShellOAuth2TokenService(
       browser_context_.get(),
       cmd->GetSwitchValueASCII(switches::kAppShellUser),
       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(
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO).get(), FROM_HERE,
       base::Bind(nacl::NaClProcessHost::EarlyStartup));
 #endif
 
   content::ShellDevToolsManagerDelegate::StartHttpHandler(
       browser_context_.get());
   if (parameters_.ui_task) {
@@ skipping 16 matching lines @@
   return true;
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopRun() {
   // NOTE: Please destroy objects in the reverse order of their creation.
   browser_main_delegate_->Shutdown();
   content::ShellDevToolsManagerDelegate::StopHttpHandler();
 
 #if !defined(DISABLE_NACL)
   task_tracker_.TryCancelAll();
-  nacl::NaClBrowser::SetDelegate(nullptr);
 #endif
 
   oauth2_token_service_.reset();
   BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
       browser_context_.get());
   extension_system_ = NULL;
   ExtensionsBrowserClient::Set(NULL);
   extensions_browser_client_.reset();
 
   desktop_controller_.reset();
@@ skipping 38 matching lines @@
 }
 
 void ShellBrowserMainParts::CreateExtensionSystem() {
   DCHECK(browser_context_);
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
 }  // namespace extensions