Allow Chrome to bind an Application request from mojo_runner.

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 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 "chrome/browser/chrome_browser_main.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 45 matching lines @@
 #include "chrome/browser/component_updater/swiftshader_component_installer.h"
 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/gpu/three_d_api_observer.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/memory/tab_manager.h"
 #include "chrome/browser/metrics/field_trial_synchronizer.h"
 #include "chrome/browser/metrics/thread_watcher.h"
+#include "chrome/browser/mojo_runner_util.h"
 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/power/process_power_collector.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_metrics_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
@@ skipping 164 matching lines @@
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #endif  // defined(USE_AURA)
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/chrome_webusb_browser_client.h"
 #include "components/webusb/webusb_detector.h"
 #endif
 
+#if defined(MOJO_RUNNER_CLIENT)
+#include "mojo/application/public/cpp/application_delegate.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/runner/child/runner_connection.h"
+#endif
+
 using content::BrowserThread;
 
 namespace {
 
 // This function provides some ways to test crash and assertion handling
 // behavior of the program.
 void HandleTestParameters(const base::CommandLine& command_line) {
   // This parameter causes a null pointer crash (crash reporter trigger).
   if (command_line.HasSwitch(switches::kBrowserCrashTest)) {
     int* bad_pointer = NULL;
@@ skipping 304 matching lines @@
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN)
 // TODO(port) This should be used on Linux Aura as well. http://crbug.com/338969
 const char kMissingLocaleDataMessage[] =
     "Unable to find locale data files. Please reinstall.";
 #endif  // defined(OS_WIN)
 
 }  // namespace chrome_browser
 
+#if defined(MOJO_RUNNER_CLIENT)
+class ChromeApplicationDelegate : public mojo::ApplicationDelegate {
+ public:
+  ChromeApplicationDelegate() {}
+  ~ChromeApplicationDelegate() override {}
+
+  // Runs the current thread's message loop until we receive an Initialize()
+  // call from the shell.
+  void RunUntilInitialize() {
+    base::MessageLoop::current()->Run();

[sky, 2015/11/05 00:29:34]

You sure you want to run a nested message loop here? The down side of doing a
message loop is you run the risk of pumping events you don't want to run at this
point. I wonder if it would be better to move this onto a dedicated thread and
wait on a mutex here.

Either way, I think it would be better to isolate all this code (this class and
the new code below) into a single class that is owned by ChromeBrowserMain. Less
ifdefs then.

+  }
+
+ private:
+  void Initialize(mojo::ApplicationImpl* application) override {
+    // TODO(beng): Connect to the window manager.
+    base::MessageLoop::current()->QuitNow();
+  }
+  bool ConfigureIncomingConnection(
+      mojo::ApplicationConnection* connection) override {
+    return false;
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeApplicationDelegate);
+};
+#endif  // defined(MOJO_RUNNER_CLIENT)
+
 // BrowserMainParts ------------------------------------------------------------
 
 ChromeBrowserMainParts::ChromeBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : parameters_(parameters),
       parsed_command_line_(parameters.command_line),
       result_code_(content::RESULT_CODE_NORMAL_EXIT),
       startup_watcher_(new StartupTimeBomb()),
       shutdown_watcher_(new ShutdownWatcherHelper()),
       browser_field_trials_(parameters.command_line),
@@ skipping 621 matching lines @@
 }
 
 int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreMainMessageLoopRunImpl");
   TRACK_SCOPED_REGION(
       "Startup", "ChromeBrowserMainParts::PreMainMessageLoopRunImpl");
 
   SCOPED_UMA_HISTOGRAM_LONG_TIMER("Startup.PreMainMessageLoopRunImplLongTime");
   const base::TimeTicks start_time_step1 = base::TimeTicks::Now();
 
+#if defined(MOJO_RUNNER_CLIENT)
+  if (chrome::IsRunningInMojoRunner()) {
+    // When run from the Mojo Runner, block until we can bind an Application
+    // request from the runner's shell, and run the main message loop until
+    // our bound ApplicationImpl is ready to use.
+    mojo::InterfaceRequest<mojo::Application> application_request;
+    runner_connection_.reset(
+        mojo::runner::RunnerConnection::ConnectToRunner(&application_request));
+    application_delegate_.reset(new ChromeApplicationDelegate);
+    application_impl_.reset(new mojo::ApplicationImpl(
+        application_delegate_.get(), application_request.Pass()));
+    application_delegate_->RunUntilInitialize();
+  }
+#endif  // defined(MOJO_RUNNER_CLIENT)
+
 #if defined(OS_WIN)
   // Windows parental controls calls can be slow, so we do an early init here
   // that calculates this value off of the UI thread.
   IncognitoModePrefs::InitializePlatformParentalControls();
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
   if (!variations::GetVariationParamValue(
       "LightSpeed", "EarlyInitStartup").empty()) {
     // Try to compute this early on another thread so that we don't spend time
@@ skipping 625 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }