Rename WeakInterfacePtrSet to InterfacePtrSet.

mojo/common/interface_ptr_set_unittest.cc

 // Copyright 2015 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/common/weak_interface_ptr_set.h"
+#include "mojo/common/interface_ptr_set.h"
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/common/message_pump_mojo.h"
 #include "mojo/common/test_interfaces.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace common {
 namespace {
 
 class DummyImpl : public tests::Dummy {
  public:
   explicit DummyImpl(InterfaceRequest<tests::Dummy> request)
       : binding_(this, request.Pass()) {}
 
   void Foo() override { call_count_++; }
 
   void CloseMessagePipe() { binding_.Close(); }
 
   int call_count() { return call_count_; }
 
  private:
   Binding<tests::Dummy> binding_;
   int call_count_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(DummyImpl);
 };
 
-// Tests all of the functionality of WeakInterfacePtrSet.
-TEST(WeakInterfacePtr, FullLifeCycleTest) {
+// Tests all of the functionality of InterfacePtrSet.
+TEST(InterfacePtrSet, FullLifeCycleTest) {

[viettrungluu, 2015/07/20 16:48:55]

nit (which I should have caught previously): For somewhat inexplicable reasons
(but following gtest conventions, as seen it its documentation), this should be:

TEST(InterfacePtrSetTest, FullLifeCycle) {

[rudominer, 2015/07/20 16:56:37]

DONE (in ps3)

   base::MessageLoop loop(MessagePumpMojo::Create());
 
   // Create 10 InterfacePtrs.
   const size_t kNumObjects = 10;
   InterfacePtr<tests::Dummy> intrfc_ptrs[kNumObjects];
 
   // Create 10 DummyImpls and 10 message pipes and bind them all together.
   std::unique_ptr<DummyImpl> impls[kNumObjects];
   for (size_t i = 0; i < kNumObjects; i++) {
     impls[i].reset(new DummyImpl(GetProxy(&intrfc_ptrs[i])));
   }
 
   // Move all 10 InterfacePtrs into the set.
-  WeakInterfacePtrSet<tests::Dummy> intrfc_ptr_set;
+  InterfacePtrSet<tests::Dummy> intrfc_ptr_set;
   EXPECT_EQ(0u, intrfc_ptr_set.size());
   for (InterfacePtr<tests::Dummy>& ptr : intrfc_ptrs) {
     intrfc_ptr_set.AddInterfacePtr(ptr.Pass());
   }
   EXPECT_EQ(kNumObjects, intrfc_ptr_set.size());
 
   // Check that initially all call counts are zero.
   for (const std::unique_ptr<DummyImpl>& impl : impls) {
     EXPECT_EQ(0, impl->call_count());
   }
@@ skipping 44 matching lines @@
   for (size_t i = 0; i < kNumObjects; i++) {
     int expected = (i < kNumObjects / 2 ? 1 : 2);
     EXPECT_EQ(expected, impls[i]->call_count());
   }
   EXPECT_EQ(0u, intrfc_ptr_set.size());
 }
 
 }  // namespace
 }  // namespace common
 }  // namespace mojo