Fix shutdown race when running Dart on the message loop

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_split.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
@@ skipping 122 matching lines @@
  public:
   DartContentHandlerApp()
       : content_handler_(this, false),
         strict_content_handler_(this, true),
         content_handler_factory_(&content_handler_),
         strict_content_handler_factory_(&strict_content_handler_),
         service_connector_(nullptr),
         default_strict_(false),
         run_on_message_loop_(false) {}
 
-  ~DartContentHandlerApp() override {}
+  ~DartContentHandlerApp() override {
+    // Shutdown the controller.
+    mojo::dart::DartController::Shutdown();
+    delete service_connector_;
+  }
 
   void ExtractApplication(base::FilePath* application_dir,
                           mojo::URLResponsePtr response,
                           const base::Closure& callback) {
     url_response_disk_cache_->UpdateAndGetExtracted(
         response.Pass(),
         [application_dir, callback](mojo::Array<uint8_t> application_dir_path,
                                     mojo::Array<uint8_t> cache_path) {
           if (application_dir_path.is_null()) {
             *application_dir = base::FilePath();
@@ skipping 81 matching lines @@
       mojo::ApplicationConnection* connection) override {
     bool strict = HasStrictQueryParam(connection->GetConnectionURL());
     if (default_strict_ || strict) {
       connection->AddService(&strict_content_handler_factory_);
     } else {
       connection->AddService(&content_handler_factory_);
     }
     return true;
   }
 
-  // Overridden from ApplicationDelegate:
-  void Quit() override {
-    // Shutdown the controller.
-    mojo::dart::DartController::Shutdown();
-    delete service_connector_;
-  }
-
   mojo::TracingImpl tracing_;
   DartContentHandler content_handler_;
   DartContentHandler strict_content_handler_;
   mojo::ContentHandlerFactory content_handler_factory_;
   mojo::ContentHandlerFactory strict_content_handler_factory_;
   mojo::URLResponseDiskCachePtr url_response_disk_cache_;
   ContentHandlerAppServiceConnector* service_connector_;
   DartTracingImpl dart_tracing_;
   bool default_strict_;
   bool run_on_message_loop_;
@@ skipping 62 matching lines @@
                     pause_isolates_on_exit));
   }
 }
 
 }  // namespace dart
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp);
   return runner.Run(application_request);
 }