Mojo: Use InterfaceFactory<Interface> for service registration

mojo/services/window_manager/window_manager_api_unittest.cc

Index: mojo/services/window_manager/window_manager_api_unittest.cc
diff --git a/mojo/services/window_manager/window_manager_api_unittest.cc b/mojo/services/window_manager/window_manager_api_unittest.cc
index 387b8af5e509786cbfe2d42bd18fa7208b36f85e..150a83eaf5c317a8d8795157b1181119468db1ba 100644
--- a/mojo/services/window_manager/window_manager_api_unittest.cc
+++ b/mojo/services/window_manager/window_manager_api_unittest.cc
@@ -10,6 +10,7 @@
 #include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/types.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/view_manager/view_manager.mojom.h"
 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h"
@@ -121,7 +122,8 @@ class TestServiceLoader : public ServiceLoader,
   typedef base::Callback<void(view_manager::Node*)> RootAddedCallback;
 
   explicit TestServiceLoader(const RootAddedCallback& root_added_callback)
-      : root_added_callback_(root_added_callback) {}
+      : root_added_callback_(root_added_callback),
+        view_manager_client_factory_(this) {}
   virtual ~TestServiceLoader() {}
 
  private:
@@ -140,7 +142,7 @@ class TestServiceLoader : public ServiceLoader,
   // Overridden from ApplicationDelegate:
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) MOJO_OVERRIDE {
-    view_manager::ViewManager::ConfigureIncomingConnection(connection, this);
+    connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
@@ -156,6 +158,7 @@ class TestServiceLoader : public ServiceLoader,
   RootAddedCallback root_added_callback_;
 
   ScopedVector<ApplicationImpl> apps_;
+  view_manager::ViewManagerClientFactory view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestServiceLoader);
 };