Add (optional) options to Run[Main]Application().

examples/authentication_demo/google_authentication_demo.cc

 // Copyright 2016 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/logging.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/public/cpp/application/application_runner.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/services/authentication/interfaces/authentication.mojom.h"
 
 namespace examples {
 namespace authentication {
 
-class GoogleAuthApp : public mojo::ApplicationDelegate {
+class GoogleAuthApp : public mojo::ApplicationImplBase {
  public:
   GoogleAuthApp() {}
 
   ~GoogleAuthApp() override {}
 
-  void Initialize(mojo::ApplicationImpl* app) override {
+  void OnInitialize() override {
     DLOG(INFO) << "Connecting to authentication service...";
-    mojo::ConnectToService(app->shell(), "mojo:authentication",
+    mojo::ConnectToService(shell(), "mojo:authentication",
                            GetProxy(&authentication_service_));
 
     mojo::Array<mojo::String> scopes;
     scopes.push_back("profile");
     scopes.push_back("email");
 
     DLOG(INFO) << "Starting the device flow handshake...";
     authentication_service_->GetOAuth2DeviceCode(
         scopes.Pass(),
         base::Bind(&GoogleAuthApp::OnDeviceCode, base::Unretained(this)));
@@ skipping 84 matching lines @@
     return;
   }
 
   ::authentication::AuthenticationServicePtr authentication_service_;
 };
 
 }  // namespace authentication
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
-  mojo::ApplicationRunner runner(
-      std::unique_ptr<examples::authentication::GoogleAuthApp>(
-          new examples::authentication::GoogleAuthApp()));
-  return runner.Run(application_request);
+  examples::authentication::GoogleAuthApp google_auth_app;
+  return mojo::RunMainApplication(application_request, &google_auth_app);
 }