Convert ViewProviderApp and ContentViewerApp to implement ApplicationImplBase instead of Applicatio…

examples/ui/png_viewer/png_viewer.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 <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/application/application_runner_chromium.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
+#include "mojo/environment/scoped_chromium_init.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/cpp/application/run_application.h"
 #include "mojo/ui/content_viewer_app.h"
 #include "mojo/ui/ganesh_view.h"
+#include "mojo/ui/view_provider_app.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace examples {
 
 namespace {
 constexpr uint32_t kContentImageResourceId = 1;
@@ skipping 88 matching lines @@
   PNGContentViewProviderApp(sk_sp<SkImage> image) : image_(image) {
     DCHECK(image_);
   }
 
   ~PNGContentViewProviderApp() override {}
 
   void CreateView(
       const std::string& connection_url,
       mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
       mojo::InterfaceRequest<mojo::ServiceProvider> services) override {
-    new PNGView(mojo::CreateApplicationConnector(app_impl()->shell()),
+    new PNGView(mojo::CreateApplicationConnector(shell()),
                 view_owner_request.Pass(), image_);
   }
 
  private:
   sk_sp<SkImage> image_;
 
   DISALLOW_COPY_AND_ASSIGN(PNGContentViewProviderApp);
 };
 
 class PNGContentViewerApp : public mojo::ui::ContentViewerApp {
@@ skipping 19 matching lines @@
     return new PNGContentViewProviderApp(SkImage::MakeFromBitmap(bitmap));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PNGContentViewerApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
-  mojo::ApplicationRunnerChromium runner(new examples::PNGContentViewerApp());
-  return runner.Run(application_request);
+  mojo::ScopedChromiumInit init;
+  examples::PNGContentViewerApp png_content_viewer_app;
+  return mojo::RunApplication(application_request, &png_content_viewer_app);
 }