Convert ViewProviderApp and ContentViewerApp to implement ApplicationImplBase instead of Applicatio…

mojo/ui/content_viewer_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.
 
 #include "mojo/ui/content_viewer_app.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/ui/view_provider_app.h"
 
 namespace mojo {
 namespace ui {
 
 class ContentViewerApp::DelegatingContentHandler : public mojo::ContentHandler {
  public:
   DelegatingContentHandler(ContentViewerApp* app,
                            const std::string& content_handler_url)
       : app_(app), content_handler_url_(content_handler_url) {}
 
@@ skipping 11 matching lines @@
   ContentViewerApp* app_;
   std::string content_handler_url_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(DelegatingContentHandler);
 };
 
 ContentViewerApp::ContentViewerApp() {}
 
 ContentViewerApp::~ContentViewerApp() {}
 
-void ContentViewerApp::Initialize(mojo::ApplicationImpl* app_impl) {
-  app_impl_ = app_impl;
-
+void ContentViewerApp::OnInitialize() {
   auto command_line = base::CommandLine::ForCurrentProcess();
-  command_line->InitFromArgv(app_impl_->args());
+  command_line->InitFromArgv(args());
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
 }
 
-bool ContentViewerApp::ConfigureIncomingConnection(
+bool ContentViewerApp::OnAcceptConnection(
     ServiceProviderImpl* service_provider_impl) {
   service_provider_impl->AddService<ContentHandler>([this](
       const ConnectionContext& connection_context,
       InterfaceRequest<ContentHandler> content_handler_request) {
     bindings_.AddBinding(
         new DelegatingContentHandler(this, connection_context.connection_url),
         content_handler_request.Pass());
   });
   return true;
 }
 
 void ContentViewerApp::StartViewer(
     const std::string& content_handler_url,
     mojo::InterfaceRequest<mojo::Application> application_request,
     mojo::URLResponsePtr response) {
+  // TODO(vtl): This is usually leaky, since |*app| (the returned
+  // |ApplicationImplBase|/|ViewProviderApp| implementation) typically doesn't
+  // own itself. Probably |LoadContent()| should take the |application_request|,
+  // and not return anything. This method doesn't really appear to add anything.
   ViewProviderApp* app = LoadContent(content_handler_url, response.Pass());
-  if (app) {
-    // TODO(vtl): This is leaky, since |ApplicationImpl| doesn't own itself.
-    // (Also, who owns |*app|?)
-    new mojo::ApplicationImpl(app, application_request.Pass());
-  }
+  if (app)
+    app->Bind(application_request.Pass());
 }
 
 }  // namespace ui
 }  // namespace mojo