Rename WeakBindingSet/WeakInterfacePtrSet to BindingSet/InterfacePtrSet.

components/mus/ws/connection_manager.h

 // 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.
 
 #ifndef COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "components/mus/public/interfaces/display.mojom.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/ids.h"
 #include "components/mus/ws/operation.h"
 #include "components/mus/ws/server_window_delegate.h"
 #include "components/mus/ws/server_window_observer.h"
 #include "components/mus/ws/window_tree_host_impl.h"
 #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 {
 
 class ClientConnection;
 class ConnectionManagerDelegate;
 class ServerWindow;
 class WindowManagerFactoryService;
 class WindowTreeHostConnection;
 class WindowTreeImpl;
@@ skipping 270 matching lines @@
 
   bool in_destructor_;
 
   // Maps from window manager change id to the client that initiated the
   // request.
   InFlightWindowManagerChangeMap in_flight_wm_change_map_;
 
   // 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_;
 
   scoped_ptr<WindowManagerFactoryService> window_manager_factory_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_