Dart: Lazy observatory asset loading. Option to disable the observatory.

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"
@@ skipping 11 matching lines @@
 #include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
 #include "services/dart/content_handler_app_service_connector.h"
 #include "services/dart/dart_app.h"
 #include "services/dart/dart_tracing.h"
 #include "url/gurl.h"
 
 namespace dart {
 
 const char kCompleteTimeline[] = "--complete-timeline";
 const char kEnableStrictMode[] = "--enable-strict-mode";
+const char kDisableObservatory[] = "--disable-observatory";
 const char kTraceStartup[] = "--trace-startup";
 
 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;
 
@@ skipping 73 matching lines @@
     app->ConnectToService("mojo:url_response_disk_cache",
                           &url_response_disk_cache_);
     service_connector_ = new ContentHandlerAppServiceConnector(app);
 
     const char* timeline_arg = nullptr;
     int timeline_arg_count = 0;
     if (app->HasArg(kCompleteTimeline)) {
       timeline_arg = kCompleteTimeline;
       timeline_arg_count = 1;
     }
+
+    bool observatory_enabled = true;
+    if (app->HasArg(kDisableObservatory)) {
+      observatory_enabled = false;
+    }
     bool success = mojo::dart::DartController::Initialize(
-        service_connector_, default_strict_, &timeline_arg, timeline_arg_count);
+        service_connector_,
+        default_strict_,
+        observatory_enabled,
+        &timeline_arg,
+        timeline_arg_count);
 
     if (app->HasArg(kTraceStartup)) {
       DartTimelineController::EnableAll();
     }
     if (!success) {
       LOG(ERROR) << "Dart VM Initialization failed";
     }
   }
 
   bool HasStrictQueryParam(const std::string& requestedUrl) {
@@ skipping 78 matching lines @@
 
 }  // 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;
 }