Index: mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc |
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc |
index 04b8d51169389dada922c64442df35f3af86b62d..094cc14d8a728c6494b8849414c481fe5111e41a 100644 |
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc |
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc |
@@ -7,7 +7,7 @@ |
#include "base/bind.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
-#include "mojo/public/cpp/bindings/allocation_scope.h" |
+#include "mojo/public/cpp/shell/service.h" |
#include "mojo/public/interfaces/shell/shell.mojom.h" |
#include "mojo/services/public/cpp/view_manager/lib/view_manager_observer.h" |
#include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h" |
@@ -189,13 +189,10 @@ ViewManagerSynchronizer::ViewManagerSynchronizer(ViewManager* view_manager) |
next_id_(1), |
next_change_id_(0), |
init_loop_(NULL) { |
- InterfacePipe<services::view_manager::IViewManager, AnyInterface> |
- view_manager_pipe; |
- AllocationScope scope; |
- MessagePipeHandle client_handle = view_manager_pipe.handle_to_peer.get(); |
- ViewManagerPrivate(view_manager_).shell()->Connect( |
- "mojo:mojo_view_manager", view_manager_pipe.handle_to_peer.Pass()); |
- service_.reset(view_manager_pipe.handle_to_self.Pass(), this); |
+ ConnectTo(ViewManagerPrivate(view_manager_).shell(), "mojo:mojo_view_manager", |
+ &service_); |
+ service_->SetClient(this); |
+ |
base::RunLoop loop; |
init_loop_ = &loop; |
init_loop_->Run(); |