Convert ViewProviderApp and ContentViewerApp to implement ApplicationImplBase instead of Applicatio…

examples/moterm_example_app/moterm_example_app.cc

 // Copyright 2015 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.
 
 // This is a simple example application (with an embeddable view), which embeds
 // the Moterm view, uses it to prompt the user, etc.
 
 #include <string.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/binding_set.h"
+#include "mojo/environment/scoped_chromium_init.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/connect.h"
+#include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/files/interfaces/file.mojom.h"
 #include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/terminal/interfaces/terminal.mojom.h"
 #include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
 #include "mojo/services/ui/views/interfaces/view_manager.mojom.h"
 #include "mojo/services/ui/views/interfaces/view_provider.mojom.h"
@@ skipping 125 matching lines @@
 class MotermExampleApp : public mojo::ui::ViewProviderApp {
  public:
   MotermExampleApp() {}
   ~MotermExampleApp() override {}
 
   // |ViewProviderApp|:
   void CreateView(
       const std::string& connection_url,
       mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
       mojo::InterfaceRequest<mojo::ServiceProvider> services) override {
-    new MotermExampleAppView(app_impl()->shell(), view_owner_request.Pass());
+    new MotermExampleAppView(shell(), view_owner_request.Pass());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MotermExampleApp);
 };
 
 MojoResult MojoMain(MojoHandle application_request) {
-  mojo::ApplicationRunnerChromium runner(new MotermExampleApp());
-  return runner.Run(application_request);
+  mojo::ScopedChromiumInit init;
+  MotermExampleApp moterm_example_app;
+  return mojo::RunApplication(application_request, &moterm_example_app);
 }