Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

mojo/services/view_manager/view_manager_connection_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/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
+#include "mojo/public/cpp/shell/service.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace services {
 namespace view_manager {
 
@@ skipping 220 matching lines @@
   Changes changes_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 class ViewManagerConnectionTest : public testing::Test {
  public:
   ViewManagerConnectionTest() {}
 
   virtual void SetUp() OVERRIDE {
-    AllocationScope allocation_scope;
-
     test_helper_.Init();
 
-    InterfacePipe<IViewManager, AnyInterface> pipe;
-    test_helper_.shell()->Connect("mojo:mojo_view_manager",
-                                  pipe.handle_to_peer.Pass());
-    view_manager_.reset(pipe.handle_to_self.Pass(), &client_);
+    ConnectTo(test_helper_.shell(), "mojo:mojo_view_manager", &view_manager_);
+    view_manager_->SetClient(&client_);
 
     client_.WaitForId();
   }
 
  protected:
   // Creates a second connection to the viewmanager.
   void EstablishSecondConnection() {
-    AllocationScope allocation_scope;
-    InterfacePipe<IViewManager, AnyInterface> pipe;
-    test_helper_.shell()->Connect("mojo:mojo_view_manager",
-                                  pipe.handle_to_peer.Pass());
-    view_manager2_.reset(pipe.handle_to_self.Pass(), &client2_);
+    ConnectTo(test_helper_.shell(), "mojo:mojo_view_manager", &view_manager2_);
+    view_manager2_->SetClient(&client2_);
 
     client2_.WaitForId();
   }
 
   void DestroySecondConnection() {
     view_manager2_.reset();
   }
 
   base::MessageLoop loop_;
   shell::ShellTestHelper test_helper_;
 
   ViewManagerClientImpl client_;
-  RemotePtr<IViewManager> view_manager_;
+  IViewManagerPtr view_manager_;
 
   ViewManagerClientImpl client2_;
-  RemotePtr<IViewManager> view_manager2_;
+  IViewManagerPtr view_manager2_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerConnectionTest);
 };
 
 // Verifies client gets a valid id.
 TEST_F(ViewManagerConnectionTest, ValidId) {
   // All these tests assume 1 for the client id. The only real assertion here is
   // the client id is not zero, but adding this as rest of code here assumes 1.
   EXPECT_EQ(1, client_.id());
 }
@@ skipping 330 matching lines @@
     GetNodeTree(view_manager2_.get(), CreateNodeId(1, 1), &nodes);
     ASSERT_EQ(2u, nodes.size());
     EXPECT_EQ("node=1,1 parent=0,1 view=null", nodes[0].ToString());
     EXPECT_EQ("node=1,11 parent=1,1 view=1,51", nodes[1].ToString());
   }
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo