3 files changed, 8 insertions, 8 deletions
diff --git a/components/mus/mus_app.h b/components/mus/mus_app.h
index c058c5f..5a349c5 100644
--- a/components/mus/mus_app.h
+++ b/components/mus/mus_app.h
@@ -18,7 +18,7 @@
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/connection_manager_delegate.h"
-#include "mojo/public/cpp/bindings/weak_binding_set.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_client.h"
@@ -104,7 +104,7 @@ class MandolineUIServicesApp
   void CreateWindowTreeHost(mojo::InterfaceRequest<mojom::WindowTreeHost> host,
                             mojom::WindowTreeClientPtr tree_client) override;
 
-  mojo::WeakBindingSet<mojom::WindowTreeHostFactory> factory_bindings_;
+  mojo::BindingSet<mojom::WindowTreeHostFactory> factory_bindings_;
   mojo::Shell* shell_;
   scoped_ptr<ws::ConnectionManager> connection_manager_;
   scoped_refptr<GpuState> gpu_state_;
diff --git a/components/mus/ws/connection_manager.h b/components/mus/ws/connection_manager.h
index 7266aa1..94b4afd 100644
--- a/components/mus/ws/connection_manager.h
+++ b/components/mus/ws/connection_manager.h
@@ -27,8 +27,8 @@
 #include "mojo/converters/surfaces/custom_surface_converter.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/weak_binding_set.h"
-#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/interface_ptr_set.h"
 
 namespace mus {
 namespace ws {
@@ -319,10 +319,10 @@ class ConnectionManager : public ServerWindowDelegate,
   // Next id supplied to the window manager.
   uint32_t next_wm_change_id_;
 
-  mojo::WeakBindingSet<mojom::DisplayManager> display_manager_bindings_;
+  mojo::BindingSet<mojom::DisplayManager> display_manager_bindings_;
   // WARNING: only use these once |got_valid_frame_decorations_| is true.
   // TODO(sky): refactor this out into its own class.
-  mojo::WeakInterfacePtrSet<mojom::DisplayManagerObserver>
+  mojo::InterfacePtrSet<mojom::DisplayManagerObserver>
       display_manager_observers_;
 
   bool got_valid_frame_decorations_;
diff --git a/components/mus/ws/window_tree_factory.h b/components/mus/ws/window_tree_factory.h
index 859a810..e0569c0 100644
--- a/components/mus/ws/window_tree_factory.h
+++ b/components/mus/ws/window_tree_factory.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
-#include "mojo/public/cpp/bindings/weak_binding_set.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
 
 namespace mus {
 namespace ws {
@@ -29,7 +29,7 @@ class WindowTreeFactory : public mus::mojom::WindowTreeFactory {
  private:
   ConnectionManager* connection_manager_;
 
-  mojo::WeakBindingSet<mus::mojom::WindowTreeFactory> binding_;
+  mojo::BindingSet<mus::mojom::WindowTreeFactory> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeFactory);
 };