Rename WeakBindingSet/WeakInterfacePtrSet to BindingSet/InterfacePtrSet.

mojo/shell/tests/capability_filter_test.cc

Index: mojo/shell/tests/capability_filter_test.cc
diff --git a/mojo/shell/tests/capability_filter_test.cc b/mojo/shell/tests/capability_filter_test.cc
index 32257eeb0c177516d739c8b12721b36e4a407978..3fac67c5645c70b87f3ecc4042f02ab4865fc106 100644
--- a/mojo/shell/tests/capability_filter_test.cc
+++ b/mojo/shell/tests/capability_filter_test.cc
@@ -9,8 +9,8 @@
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/public/cpp/bindings/weak_binding_set.h"
 #include "mojo/services/package_manager/package_manager.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/public/cpp/connection.h"
@@ -98,7 +98,7 @@ class ConnectionValidator : public ApplicationLoader,
   std::set<std::string> expectations_;
   std::set<std::string> unexpected_;
   base::MessageLoop* loop_;
-  WeakBindingSet<Validator> validator_bindings_;
+  BindingSet<Validator> validator_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionValidator);
 };
@@ -151,8 +151,8 @@ class ServiceApplication : public ShellClient,
 
   Shell* shell_;
   ValidatorPtr validator_;
-  WeakBindingSet<Safe> safe_bindings_;
-  WeakBindingSet<Unsafe> unsafe_bindings_;
+  BindingSet<Safe> safe_bindings_;
+  BindingSet<Unsafe> unsafe_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceApplication);
 };