4 files changed, 8 insertions, 8 deletions
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index 14a5500..787afc7 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -20,7 +20,7 @@
 #include "mash/shell/shell_application_delegate.h"
 #include "mash/wm/window_manager_application.h"
 #include "mojo/common/mojo_scheme_register.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/weak_binding_set.h"
 #include "mojo/shell/background/background_shell.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/native_runner_delegate.h"
@@ -105,7 +105,7 @@ class DefaultShellClient : public mojo::ShellClient,
     return nullptr;
   }
 
-  mojo::BindingSet<ShellClientFactory> shell_client_factory_bindings_;
+  mojo::WeakBindingSet<ShellClientFactory> shell_client_factory_bindings_;
   scoped_ptr<mojo::ShellClient> shell_client_;
   scoped_ptr<mojo::ShellConnection> shell_connection_;
 
diff --git a/chrome/browser/chromeos/chrome_interface_factory.h b/chrome/browser/chromeos/chrome_interface_factory.h
index 3a8f8f1..5b2da45 100644
--- a/chrome/browser/chromeos/chrome_interface_factory.h
+++ b/chrome/browser/chromeos/chrome_interface_factory.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_
 
 #include "content/public/common/mojo_shell_connection.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/weak_binding_set.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "ui/keyboard/keyboard.mojom.h"
 
@@ -32,7 +32,7 @@ class ChromeInterfaceFactory
       mojo::InterfaceRequest<keyboard::mojom::Keyboard> request) override;
 
   scoped_ptr<KeyboardUIService> keyboard_ui_service_;
-  mojo::BindingSet<keyboard::mojom::Keyboard> keyboard_bindings_;
+  mojo::WeakBindingSet<keyboard::mojom::Keyboard> keyboard_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeInterfaceFactory);
 };
diff --git a/chrome/browser/usb/web_usb_permission_bubble.h b/chrome/browser/usb/web_usb_permission_bubble.h
index d55ffc6..687f2c0 100644
--- a/chrome/browser/usb/web_usb_permission_bubble.h
+++ b/chrome/browser/usb/web_usb_permission_bubble.h
@@ -11,8 +11,8 @@
 #include "components/bubble/bubble_reference.h"
 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/weak_binding_set.h"
 
 namespace content {
 class RenderFrameHost;
@@ -39,7 +39,7 @@ class ChromeWebUsbPermissionBubble : public webusb::WebUsbPermissionBubble {
 
  private:
   content::RenderFrameHost* const render_frame_host_;
-  mojo::BindingSet<webusb::WebUsbPermissionBubble> bindings_;
+  mojo::WeakBindingSet<webusb::WebUsbPermissionBubble> bindings_;
   std::vector<BubbleReference> bubbles_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeWebUsbPermissionBubble);
diff --git a/chrome/browser/usb/web_usb_permission_provider.h b/chrome/browser/usb/web_usb_permission_provider.h
index 19b6f30..a85d16a 100644
--- a/chrome/browser/usb/web_usb_permission_provider.h
+++ b/chrome/browser/usb/web_usb_permission_provider.h
@@ -9,8 +9,8 @@
 
 #include "device/usb/public/interfaces/permission_provider.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/weak_binding_set.h"
 
 namespace content {
 class RenderFrameHost;
@@ -44,7 +44,7 @@ class WebUSBPermissionProvider : public device::usb::PermissionProvider {
       mojo::InterfaceRequest<device::usb::PermissionProvider> request) override;
 
  private:
-  mojo::BindingSet<PermissionProvider> bindings_;
+  mojo::WeakBindingSet<PermissionProvider> bindings_;
   content::RenderFrameHost* const render_frame_host_;
 };