Extracts InterfaceRegistry from ConnectionImpl.

mojo/shell/public/cpp/tests/connection_impl_unittest.cc

Index: mojo/shell/public/cpp/tests/connection_impl_unittest.cc
diff --git a/mojo/shell/public/cpp/tests/connection_impl_unittest.cc b/mojo/shell/public/cpp/tests/connection_impl_unittest.cc
deleted file mode 100644
index d93da433e0d29fe6dff00fd2369d94850f8fd7b5..0000000000000000000000000000000000000000
--- a/mojo/shell/public/cpp/tests/connection_impl_unittest.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// 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/shell/public/cpp/lib/connection_impl.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "mojo/shell/public/cpp/interface_binder.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace mojo {
-namespace internal {
-namespace {
-
-class TestBinder : public InterfaceBinder {
- public:
-  explicit TestBinder(int* delete_count) : delete_count_(delete_count) {}
-  ~TestBinder() override { (*delete_count_)++; }
-  void BindInterface(Connection* connection,
-                     const std::string& interface_name,
-                     ScopedMessagePipeHandle client_handle) override {}
-
- private:
-  int* delete_count_;
-};
-
-TEST(ConnectionImplTest, Ownership) {
-  int delete_count = 0;
-
-  // Destruction.
-  {
-    ConnectionImpl connection;
-    ConnectionImpl::TestApi test_api(&connection);
-    test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC1");
-  }
-  EXPECT_EQ(1, delete_count);
-
-  // Removal.
-  {
-    scoped_ptr<ConnectionImpl> connection(new ConnectionImpl);
-    InterfaceBinder* b = new TestBinder(&delete_count);
-    ConnectionImpl::TestApi test_api(connection.get());
-    test_api.SetInterfaceBinderForName(b, "TC1");
-    test_api.RemoveInterfaceBinderForName("TC1");
-    connection.reset();
-    EXPECT_EQ(2, delete_count);
-  }
-
-  // Multiple.
-  {
-    ConnectionImpl connection;
-    ConnectionImpl::TestApi test_api(&connection);
-    test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC1");
-    test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC2");
-  }
-  EXPECT_EQ(4, delete_count);
-
-  // Re-addition.
-  {
-    ConnectionImpl connection;
-    ConnectionImpl::TestApi test_api(&connection);
-    test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC1");
-    test_api.SetInterfaceBinderForName(new TestBinder(&delete_count), "TC1");
-    EXPECT_EQ(5, delete_count);
-  }
-  EXPECT_EQ(6, delete_count);
-}
-
-}  // namespace
-}  // namespace internal
-}  // namespace mojo