Chromium Code Reviews| Index: chrome/browser/chrome_browser_main.cc |
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
| index 1342b24558753d619d082adc8db8e31481de630c..5e20594b58e24192ea90cd61217ae559d5147e7e 100644 |
| --- a/chrome/browser/chrome_browser_main.cc |
| +++ b/chrome/browser/chrome_browser_main.cc |
| @@ -1648,12 +1648,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { |
| content::WebUIControllerFactory::RegisterFactory( |
| ChromeWebUIControllerFactory::GetInstance()); |
| +#if !defined(DISABLE_NACL) |
| // NaClBrowserDelegateImpl is accessed inside PostProfileInit(). |
| // So make sure to create it before that. |
| -#if !defined(DISABLE_NACL) |
| - NaClBrowserDelegateImpl* delegate = |
| - new NaClBrowserDelegateImpl(browser_process_->profile_manager()); |
| - nacl::NaClBrowser::SetDelegate(delegate); |
| + nacl::NaClBrowser::SetDelegate(base::MakeUnique<NaClBrowserDelegateImpl>( |
| + browser_process_->profile_manager())); |
|
Wez
2017/01/14 01:53:11
bradnelson: Is it possible to move this to be pre-
|
| #endif // !defined(DISABLE_NACL) |
| // TODO(stevenjb): Move WIN and MACOSX specific code to appropriate Parts. |