Changes magic sequence to '!#mojo ' and strips 'mojo ' when building url

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_path.h"
 #include "base/files/file_util.h"
@@ skipping 13 matching lines @@
 #include "shell/data_pipe_peek.h"
 #include "shell/filename_util.h"
 #include "shell/switches.h"
 #include "url/url_util.h"
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
-static const char kMojoMagic[] = "#!mojo:";
+static const char kMojoMagic[] = "#!mojo ";
 static const size_t kMaxShebangLength = 2048;
 
 void IgnoreResult(bool result) {
 }
 
 }  // namespace
 
 // Encapsulates loading and running one individual application.
 //
 // Loaders are owned by DynamicApplicationLoader. DynamicApplicationLoader must
@@ skipping 29 matching lines @@
       base::TaskRunner* task_runner,
       base::Callback<void(const base::FilePath&, bool)> callback) = 0;
 
   virtual std::string MimeType() = 0;
 
   virtual bool HasMojoMagic() = 0;
 
   virtual bool PeekFirstLine(std::string* line) = 0;
 
   void Load() {
-    // If the response begins with a #!mojo:<content-handler-url>, use it.
+    // If the response begins with a #!mojo <content-handler-url>, use it.
     GURL url;
     std::string shebang;
     if (PeekContentHandler(&shebang, &url)) {
       load_callback_.Run(
           url, shell_handle_.Pass(),
           AsURLResponse(context_->task_runners()->blocking_pool(),
                         static_cast<int>(shebang.size())));
       return;
     }
 
@@ skipping 14 matching lines @@
            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)) {
-      GURL url(shebang.substr(2, std::string::npos));
+      GURL url(shebang.substr(arraysize(kMojoMagic) - 1, std::string::npos));
       if (url.is_valid()) {
         *mojo_shebang = shebang;
         *mojo_content_handler_url = url;
         return true;
       }
     }
     return false;
   }
 
   void RunLibrary(const base::FilePath& path, bool path_exists) {
@@ skipping 271 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