Mojo: Use InterfaceFactory<Interface> for service registration

mojo/examples/aura_demo/aura_demo.cc

 // Copyright 2013 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 <stdio.h>
 #include <string>
 
 #include "base/bind.h"
 #include "mojo/aura/context_factory_mojo.h"
 #include "mojo/aura/screen_mojo.h"
 #include "mojo/aura/window_tree_host_mojo.h"
 #include "mojo/aura/window_tree_host_mojo_delegate.h"
+#include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
+#include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
@@ skipping 75 matching lines @@
 };
 
 class AuraDemo : public ApplicationDelegate,
                  public WindowTreeHostMojoDelegate,
                  public view_manager::ViewManagerDelegate {
  public:
   AuraDemo()
       : window1_(NULL),
         window2_(NULL),
         window21_(NULL),
-        view_(NULL) {
-  }
+        view_(NULL),
+        view_manager_client_factory_(this) {}
   virtual ~AuraDemo() {}
 
  private:
   // Overridden from view_manager::ViewManagerDelegate:
   virtual void OnRootAdded(view_manager::ViewManager* view_manager,
                            view_manager::Node* root) OVERRIDE {
     // TODO(beng): this function could be called multiple times!
     view_ = view_manager::View::Create(view_manager);
     root->SetActiveView(view_);
 
@@ skipping 39 matching lines @@
   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
     aura::Env::CreateInstance(true);
     context_factory_.reset(new ContextFactoryMojo);
     aura::Env::GetInstance()->set_context_factory(context_factory_.get());
     screen_.reset(ScreenMojo::Create());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
-    view_manager::ViewManager::ConfigureIncomingConnection(connection, this);
+    connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
   scoped_ptr<DemoWindowTreeClient> window_tree_client_;
 
   scoped_ptr<ui::ContextFactory> context_factory_;
 
   scoped_ptr<ScreenMojo> screen_;
 
   scoped_ptr<DemoWindowDelegate> delegate1_;
   scoped_ptr<DemoWindowDelegate> delegate2_;
   scoped_ptr<DemoWindowDelegate> delegate21_;
 
   aura::Window* window1_;
   aura::Window* window2_;
   aura::Window* window21_;
 
   view_manager::View* view_;
 
+  view_manager::ViewManagerClientFactory view_manager_client_factory_;
+
   scoped_ptr<aura::WindowTreeHost> window_tree_host_;
 
   DISALLOW_COPY_AND_ASSIGN(AuraDemo);
 };
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::AuraDemo();
 }
 
 }  // namespace mojo