Enable HTTP loading in Mojo dart content handler

services/dart/content_handler_main.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/dart/embedder/dart_controller.h"
 #include "mojo/icu/icu.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
 #include "services/dart/content_handler_app_service_connector.h"
 #include "services/dart/dart_app.h"
 #include "url/gurl.h"
 
 namespace dart {
 
+static bool IsDartZip(std::string url) {
+  // If the url doesn't end with ".dart" we assume it is a zipped up
+  // dart application.
+  return !EndsWith(url, ".dart", false);
+}
+
 class DartContentHandlerApp;
 
 class DartContentHandler : public mojo::ContentHandlerFactory::ManagedDelegate {
  public:
   DartContentHandler(DartContentHandlerApp* app, bool strict)
       : app_(app), strict_(strict) {
   }
 
   void set_handler_task_runner(
       scoped_refptr<base::SingleThreadTaskRunner> handler_task_runner) {
@@ skipping 101 matching lines @@
   ContentHandlerAppServiceConnector* service_connector_;
 
   DISALLOW_COPY_AND_ASSIGN(DartContentHandlerApp);
 };
 
 scoped_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
 DartContentHandler::CreateApplication(
     mojo::InterfaceRequest<mojo::Application> application_request,
     mojo::URLResponsePtr response) {
   base::FilePath application_dir;
-  {
+  std::string url = response->url.get();
+  if (IsDartZip(response->url.get())) {
+    // Loading a .dartzip:
+    // 1) Extract the .dartzip
+    // 2) Launch from temporary directory (|application_dir|).
     handler_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(
             &DartContentHandlerApp::ExtractApplication, base::Unretained(app_),
             base::Unretained(&application_dir), base::Passed(response.Pass()),
             base::Bind(
                 base::IgnoreResult(&base::SingleThreadTaskRunner::PostTask),
                 base::MessageLoop::current()->task_runner(), FROM_HERE,
                 base::MessageLoop::QuitWhenIdleClosure())));
     base::RunLoop().Run();
+    return make_scoped_ptr(
+        new DartApp(application_request.Pass(), application_dir, strict_));
+  } else {
+    // Loading a raw .dart file pointed at by |url|.
+    return make_scoped_ptr(
+        new DartApp(application_request.Pass(), url, strict_));
   }
-
-  return make_scoped_ptr(
-      new DartApp(application_request.Pass(), application_dir, strict_));
 }
 
 }  // namespace dart
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp);
   MojoResult r = runner.Run(application_request);
   // TODO(johnmccutchan): Remove this once the Dart VM shuts down threads.
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100));
   return r;
 }