Mojo: Use InterfaceFactory<Interface> for service registration

mojo/services/view_manager/view_manager_unittest.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 <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 289 matching lines @@
 
 // static
 base::RunLoop* ViewManagerProxy::main_run_loop_ = NULL;
 
 // static
 bool ViewManagerProxy::in_embed_ = false;
 
 class TestViewManagerClientConnection
     : public InterfaceImpl<ViewManagerClient> {
  public:
-  TestViewManagerClientConnection(ApplicationConnection* app_connection) :
-      connection_(&tracker_) {
+  explicit TestViewManagerClientConnection() : connection_(&tracker_) {
     tracker_.set_delegate(&connection_);
   }
 
   // InterfaceImp:
   virtual void OnConnectionEstablished() OVERRIDE {
     connection_.set_router(internal_state()->router());
     connection_.set_view_manager(client());
   }
 
   // ViewMangerClient:
@@ skipping 47 matching lines @@
 
  private:
   TestChangeTracker tracker_;
   ViewManagerProxy connection_;
 
   DISALLOW_COPY_AND_ASSIGN(TestViewManagerClientConnection);
 };
 
 // Used with ViewManagerService::Embed(). Creates a
 // TestViewManagerClientConnection, which creates and owns the ViewManagerProxy.
-class EmbedServiceLoader : public ServiceLoader, ApplicationDelegate {
+class EmbedServiceLoader : public ServiceLoader,
+                           ApplicationDelegate,
+                           public InterfaceFactory<ViewManagerClient> {
  public:
   EmbedServiceLoader() {}
   virtual ~EmbedServiceLoader() {}
 
-  // ServiceLoader:
+  // ServiceLoader implementation:
   virtual void LoadService(ServiceManager* manager,
                            const GURL& url,
                            ScopedMessagePipeHandle shell_handle) OVERRIDE {
     scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this,
                                                         shell_handle.Pass()));
     apps_.push_back(app.release());
   }
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
   }
 
-  // ApplicationDelegate
+  // ApplicationDelegate implementation:
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       OVERRIDE {
-    connection->AddService<TestViewManagerClientConnection>();
+    connection->AddService(this);
     return true;
   }
 
+  // InterfaceFactory<ViewManagerClient> implementation:
+  virtual void Create(ApplicationConnection* connection,
+                      InterfaceRequest<ViewManagerClient> request) OVERRIDE {
+    BindToRequest(new TestViewManagerClientConnection, &request);
+  }
+
  private:
   ScopedVector<ApplicationImpl> apps_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbedServiceLoader);
 };
 
 // Creates an id used for transport from the specified parameters.
 Id BuildNodeId(ConnectionSpecificId connection_id,
                ConnectionSpecificId node_id) {
   return (connection_id << 16) | node_id;
@@ skipping 86 matching lines @@
                 ChangeNodeDescription(changes));
     }
   }
 
   void DestroySecondConnection() {
     connection2_->Destroy();
     connection2_ = NULL;
   }
 
   base::ShadowingAtExitManager at_exit_;
+  shell::ShellTestHelper test_helper_;
   base::MessageLoop loop_;
-  shell::ShellTestHelper test_helper_;
 
   ViewManagerInitServicePtr view_manager_init_;
 
   ViewManagerProxy* connection_;
   ViewManagerProxy* connection2_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerTest);
 };
 
 // Verifies client gets a valid id.
@@ skipping 864 matching lines @@
 // originating connection.
 
 // TODO(beng): Add tests for focus:
 // - focus between two nodes known to a connection
 // - focus between nodes unknown to one of the connections.
 // - focus between nodes unknown to either connection.
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo