Add NaCl support to app_shell

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 "base/command_line.h"
 #include "base/run_loop.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/omaha_query_params/omaha_query_params.h"
@@ skipping 13 matching lines @@
 #include "extensions/shell/common/switches.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "extensions/shell/browser/shell_network_controller_chromeos.h"
 #endif
 
+#if !defined(DISABLE_NACL)
+#include "components/nacl/browser/nacl_browser.h"
+#include "components/nacl/browser/nacl_process_host.h"
+#include "content/public/browser/browser_thread.h"
+#include "extensions/shell/browser/shell_nacl_browser_delegate.h"
+#endif
+
 using content::BrowserContext;
+using content::BrowserThread;
 
 namespace {
 
 // Register additional KeyedService factories here. See
 // ChromeBrowserMainExtraPartsProfiles for details.
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
   extensions::ShellExtensionSystemFactory::GetInstance();
 }
 
@@ skipping 43 matching lines @@
   // Initialize our "profile" equivalent.
   browser_context_.reset(new ShellBrowserContext);
 
   desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
   desktop_controller_->CreateRootWindow();
 
   // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
   // TODO(jamescook): Initialize chromeos::UserManager.
   net_log_.reset(new content::ShellNetLog("app_shell"));
 
-  extensions_client_.reset(new ShellExtensionsClient());
-  ExtensionsClient::Set(extensions_client_.get());
-
-  extensions_browser_client_.reset(
-      new ShellExtensionsBrowserClient(browser_context_.get()));
-  ExtensionsBrowserClient::Set(extensions_browser_client_.get());
+  InitExtensionsModule();
 
   omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate);
   omaha_query_params::OmahaQueryParams::SetDelegate(
       omaha_query_params_delegate_.get());
 
-  // Create our custom ExtensionSystem first because other
-  // KeyedServices depend on it.
-  // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
-  CreateExtensionSystem();
-
   ::EnsureBrowserContextKeyedServiceFactoriesBuilt();
   BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
       browser_context_.get());
 
+#if !defined(DISABLE_NACL)
+  // Takes ownership.
+  nacl::NaClBrowser::SetDelegate(
+      new ShellNaClBrowserDelegate(browser_context_.get()));
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(nacl::NaClProcessHost::EarlyStartup));
+#endif
+
   devtools_delegate_.reset(
       new content::ShellDevToolsDelegate(browser_context_.get()));
   if (parameters_.ui_task) {
     // For running browser tests.
     parameters_.ui_task->Run();
     delete parameters_.ui_task;
     run_message_loop_ = false;
   } else {
     browser_main_delegate_->Start(browser_context_.get());
   }
@@ skipping 22 matching lines @@
   desktop_controller_.reset();
 }
 
 void ShellBrowserMainParts::PostDestroyThreads() {
 #if defined(OS_CHROMEOS)
   network_controller_.reset();
   chromeos::DBusThreadManager::Shutdown();
 #endif
 }
 
-void ShellBrowserMainParts::CreateExtensionSystem() {
+void ShellBrowserMainParts::InitExtensionsModule() {

[teravest, 2014/08/12 15:48:31]

Why does this code have to be moved into InitExtensionsModule() as part of this
change?

[James Cook, 2014/08/12 18:17:05]

It doesn't have to be. I thought PreMainMessageLoopRun() was getting a little
too long, but I can clean that up in another CL.  Moved it back.

   DCHECK(browser_context_);
+
+  extensions_client_.reset(new ShellExtensionsClient());
+  ExtensionsClient::Set(extensions_client_.get());
+
+  extensions_browser_client_.reset(
+      new ShellExtensionsBrowserClient(browser_context_.get()));
+  ExtensionsBrowserClient::Set(extensions_browser_client_.get());
+
+  // Create our custom ExtensionSystem first because other KeyedServices depend
+  // on it.
+  // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
 }  // namespace extensions