Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

mojo/services/view_manager/root_view_manager.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 "mojo/services/view_manager/root_view_manager.h"
 
 #include "base/auto_reset.h"
 #include "mojo/aura/screen_mojo.h"
 #include "mojo/aura/window_tree_host_mojo.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/view_manager/root_node_manager.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window.h"
 
 namespace mojo {
 namespace services {
 namespace view_manager {
 
@@ skipping 25 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl);
 };
 
 RootViewManager::RootViewManager(Shell* shell, RootNodeManager* root_node)
     : shell_(shell),
       root_node_manager_(root_node),
       in_setup_(false) {
   screen_.reset(ScreenMojo::Create());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
-  InterfacePipe<NativeViewport, AnyInterface> pipe;
-  mojo::AllocationScope scope;
-  shell_->Connect("mojo:mojo_native_viewport_service",
-                  pipe.handle_to_peer.Pass());
+  NativeViewportPtr viewport;
+  ConnectTo(shell, "mojo:mojo_native_viewport_service", &viewport);
   window_tree_host_.reset(new WindowTreeHostMojo(
-        pipe.handle_to_self.Pass(),
+        viewport.Pass(),
         gfx::Rect(800, 600),
         base::Bind(&RootViewManager::OnCompositorCreated,
                    base::Unretained(this))));
 }
 
 RootViewManager::~RootViewManager() {
   window_tree_client_.reset();
   window_tree_host_.reset();
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
 }
 
 void RootViewManager::OnCompositorCreated() {
   base::AutoReset<bool> resetter(&in_setup_, true);
   window_tree_host_->InitHost();
 
   aura::Window* root = root_node_manager_->root()->window();
   window_tree_host_->window()->AddChild(root);
   root->SetBounds(gfx::Rect(window_tree_host_->window()->bounds().size()));
   root_node_manager_->root()->window()->Show();
 
   window_tree_client_.reset(
       new WindowTreeClientImpl(window_tree_host_->window()));
 
   window_tree_host_->Show();
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo