Make Mandoline shut down cleanly.

components/native_viewport/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/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "components/gles2/gpu_impl.h"
 #include "components/native_viewport/native_viewport_impl.h"
 #include "components/native_viewport/public/cpp/args.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h"
 #include "ui/events/event_switches.h"
+#include "ui/events/platform/platform_event_source.h"
 #include "ui/gl/gl_surface.h"
 
 using mojo::ApplicationConnection;
 using mojo::Gpu;
 using mojo::NativeViewport;
 
 namespace native_viewport {
 
 class NativeViewportAppDelegate : public mojo::ApplicationDelegate,
                                   public mojo::InterfaceFactory<NativeViewport>,
                                   public mojo::InterfaceFactory<Gpu> {
  public:
   NativeViewportAppDelegate() : is_headless_(false) {}
   ~NativeViewportAppDelegate() override {}
 
  private:
   // mojo::ApplicationDelegate implementation.
   void Initialize(mojo::ApplicationImpl* application) override {
+    event_source_ = ui::PlatformEventSource::CreateDefault();

[jam, 2015/05/13 19:55:09]

this is moved to the app instead of NativeViewPortImpl because:
1) this is a singleton, and once we have multi-window we will have multiple
NativeViewPortImpl
2) this needs to outlive NativeViewPortImpl

     tracing_.Initialize(application);
 
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     is_headless_ = command_line->HasSwitch(mojo::kUseHeadlessConfig);
     if (!is_headless_) {
       if (command_line->HasSwitch(mojo::kUseTestConfig))
         gfx::GLSurface::InitializeOneOffForTests();
       else
         gfx::GLSurface::InitializeOneOff();
     }
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService<NativeViewport>(this);
     connection->AddService<Gpu>(this);
     return true;
   }
 
   // mojo::InterfaceFactory<NativeViewport> implementation.
   void Create(ApplicationConnection* connection,
               mojo::InterfaceRequest<NativeViewport> request) override {
     if (!gpu_state_.get())
       gpu_state_ = new gles2::GpuState;
-    new NativeViewportImpl(is_headless_, gpu_state_, request.Pass());
+    new NativeViewportImpl(is_headless_,
+                           gpu_state_,
+                           request.Pass(),
+                           app_lifetime_helper.CreateServiceRefCount());
   }
 
   // mojo::InterfaceFactory<Gpu> implementation.
   void Create(ApplicationConnection* connection,
               mojo::InterfaceRequest<Gpu> request) override {
     if (!gpu_state_.get())
       gpu_state_ = new gles2::GpuState;
     new gles2::GpuImpl(request.Pass(), gpu_state_);
   }
 
   scoped_refptr<gles2::GpuState> gpu_state_;
+  scoped_ptr<ui::PlatformEventSource> event_source_;
   bool is_headless_;
   mojo::TracingImpl tracing_;
+  mojo::AppLifetimeHelper app_lifetime_helper;

[Ben Goodger (Google), 2015/05/13 20:21:07]

app_lifetime_helper_

[jam, 2015/05/14 14:42:47]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate);
 };
 }
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(
       new native_viewport::NativeViewportAppDelegate);
   runner.set_message_loop_type(base::MessageLoop::TYPE_UI);
   return runner.Run(shell_handle);
 }