Convert ViewProviderApp and ContentViewerApp to implement ApplicationImplBase instead of Applicatio…

examples/ui/png_viewer/png_viewer.cc

Index: examples/ui/png_viewer/png_viewer.cc
diff --git a/examples/ui/png_viewer/png_viewer.cc b/examples/ui/png_viewer/png_viewer.cc
index 6e895234df02351ccb2165516905201c1588314f..2ad6551012a2cfe21ec178bd413299de2f843a02 100644
--- a/examples/ui/png_viewer/png_viewer.cc
+++ b/examples/ui/png_viewer/png_viewer.cc
@@ -7,12 +7,14 @@
 #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"
@@ -121,7 +123,7 @@ class PNGContentViewProviderApp : public mojo::ui::ViewProviderApp {
       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_);
   }
 
@@ -161,6 +163,7 @@ class PNGContentViewerApp : public mojo::ui::ContentViewerApp {
 }  // 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);
 }