Launch nexes from mojo_shell.

shell/dynamic_application_loader.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 "shell/dynamic_application_loader.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "shell/context.h"
 #include "shell/data_pipe_peek.h"
 #include "shell/filename_util.h"
+#if MOJO_USE_NACL
+#include "shell/nacl/nacl_service_runner.h"
+#endif
 #include "shell/switches.h"
 #include "url/url_util.h"
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
 static const char kMojoMagic[] = "#!mojo ";
 static const size_t kMaxShebangLength = 2048;
@@ skipping 64 matching lines @@
           iter->second, application_request_.Pass(),
           AsURLResponse(context_->task_runners()->blocking_pool(), 0));
       return;
     }
 
     // TODO(aa): Sanity check that the thing we got looks vaguely like a mojo
     // application. That could either mean looking for the platform-specific dll
     // header, or looking for some specific mojo signature prepended to the
     // library.
 
     AsPath(context_->task_runners()->blocking_pool(),

[jamesr, 2015/01/28 23:11:30]

hmm, wouldn't it make more sense to check for .nexe here along with the shebang
and mimetype sniffing?

[Nick Bray (chromium), 2015/01/29 22:31:35]

Done.

            base::Bind(&Loader::RunLibrary, weak_ptr_factory_.GetWeakPtr()));
   }
 
   void ReportComplete() { loader_complete_callback_.Run(this); }
 
  private:
   bool PeekContentHandler(std::string* mojo_shebang,
                           GURL* mojo_content_handler_url) {
     std::string shebang;
     if (HasMojoMagic() && PeekFirstLine(&shebang)) {
@@ skipping 10 matching lines @@
   void RunLibrary(const base::FilePath& path, bool path_exists) {
     DCHECK(application_request_.is_pending());
 
     if (!path_exists) {
       LOG(ERROR) << "Library not started because library path '" << path.value()
                  << "' does not exist.";
       ReportComplete();
       return;
     }
 
-    runner_ = runner_factory_->Create(context_);
-    runner_->Start(
-        path, cleanup_behavior_, application_request_.Pass(),
-        base::Bind(&Loader::ReportComplete, weak_ptr_factory_.GetWeakPtr()));
+    // TODO(ncbray) sniff or infer the content type at a previous stage in the
+    // pipeline.
+    if (path.Extension() == FILE_PATH_LITERAL(".nexe")) {
+#if MOJO_USE_NACL
+      nacl_runner_ = scoped_ptr<NaClServiceRunner>(

[jamesr, 2015/01/28 23:11:30]

nacl_runner_.reset(new ....);

[Nick Bray (chromium), 2015/01/29 22:31:34]

Done.

+          new NaClServiceRunner(context_));
+      nacl_runner_->Start(path, application_request_.Pass());

[jamesr, 2015/01/28 23:11:30]

add a return; here and leave the last bit un-indented

[Nick Bray (chromium), 2015/01/29 22:31:34]

Done.

+#else
+      LOG(ERROR) << "Library not started because Native Client is not enabled.";
+      ReportComplete();

[jamesr, 2015/01/28 23:11:30]

return;

[Nick Bray (chromium), 2015/01/29 22:31:34]

Done.

+#endif
+    } else {
+      runner_ = runner_factory_->Create(context_);
+      runner_->Start(
+          path, cleanup_behavior_, application_request_.Pass(),
+          base::Bind(&Loader::ReportComplete, weak_ptr_factory_.GetWeakPtr()));
+    }
   }
 
   DynamicServiceRunner::CleanupBehavior cleanup_behavior_;
   InterfaceRequest<Application> application_request_;
   ApplicationLoader::LoadCallback load_callback_;
   LoaderCompleteCallback loader_complete_callback_;
   Context* context_;
   MimeTypeToURLMap* mime_type_to_url_;
   DynamicServiceRunnerFactory* runner_factory_;
   scoped_ptr<DynamicServiceRunner> runner_;
+#if MOJO_USE_NACL
+  scoped_ptr<NaClServiceRunner> nacl_runner_;
+#endif
   base::WeakPtrFactory<Loader> weak_ptr_factory_;
 };
 
 // A loader for local files.
 class DynamicApplicationLoader::LocalLoader : public Loader {
  public:
   LocalLoader(const GURL& url,
               MimeTypeToURLMap* mime_type_to_url,
               Context* context,
               DynamicServiceRunnerFactory* runner_factory,
@@ skipping 326 matching lines @@
   // TODO(darin): What should we do about service errors? This implies that
   // the app closed its handle to the service manager. Maybe we don't care?
 }
 
 void DynamicApplicationLoader::LoaderComplete(Loader* loader) {
   loaders_.erase(std::find(loaders_.begin(), loaders_.end(), loader));
 }
 
 }  // namespace shell
 }  // namespace mojo