Add NaCl support to app_shell

extensions/shell/browser/shell_browser_main_parts.cc

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 3a33566a9ad25d6009af6aef9c90ea2162365b23..10f694e5be557e2792c3be2b1bdb3c18c56e5d25 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -31,6 +31,13 @@
 #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;
 
 namespace {
@@ -115,6 +122,16 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
   BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
       browser_context_.get());
 
+#if !defined(DISABLE_NACL)
+  // Takes ownership.
+  nacl::NaClBrowser::SetDelegate(
+      new ShellNaClBrowserDelegate(browser_context_.get()));
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(nacl::NaClProcessHost::EarlyStartup));
+#endif
+
   devtools_delegate_.reset(
       new content::ShellDevToolsDelegate(browser_context_.get()));
   if (parameters_.ui_task) {