alternate shape for content handler boilerplate

examples/pdf_viewer/pdf_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 "base/strings/string_tokenizer.h"
 #include "examples/bitmap_uploader/bitmap_uploader.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 174 matching lines @@
   int page_count_;
   FPDF_DOCUMENT doc_;
   ApplicationImpl* app_;
   View* root_;
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
   scoped_ptr<BitmapUploader> bitmap_uploader_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFView);
 };
 
-class PDFViewer : public ContentHandlerDelegate {
+class PDFViewer : public ApplicationDelegate, ContentHandlerFactory::Delegate {
  public:
-  PDFViewer() {
+  PDFViewer() : content_handler_factory_(this) {
     v8::V8::InitializeICU();
     FPDF_InitLibrary(NULL);
   }
 
   virtual ~PDFViewer() {
     FPDF_DestroyLibrary();
   }
  private:
-  // Overridden from ContentHandlerDelegate:
-  virtual scoped_ptr<mojo::InterfaceImpl<mojo::Application>> CreateApplication(
-      ShellPtr shell,
+  // Overridden from ApplicationDelegate:
+  virtual bool ConfigureIncomingConnection(
+      ApplicationConnection* connection) override {
+    connection->AddService(&content_handler_factory_);
+    return true;
+  }
+
+  // Overridden from ContentHandlerFactory::Delegate:
+  virtual ApplicationDelegate* CreateApplication(
       URLResponsePtr response) override {
-    return make_scoped_ptr(new mojo::ApplicationImpl(
-        new PDFView(response.Pass()), shell.PassMessagePipe()));
+    return new PDFView(response.Pass());
   }
 
+  ContentHandlerFactory content_handler_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(PDFViewer);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  return mojo::ContentHandlerRunner::Run(
-      shell_handle, make_scoped_ptr(new mojo::examples::PDFViewer));
+  mojo::ApplicationRunnerChromium runner(new mojo::examples::PDFViewer());
+  return runner.Run(shell_handle);
 }