summaryrefslogtreecommitdiffstats
path: root/mojo/shell/tests/application_manager_apptest_driver.cc
diff options
context:
space:
mode:
authoryzshen <yzshen@chromium.org>2016-02-24 23:29:27 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-25 07:30:23 +0000
commitd414dc34a7f87a2000e09c58b9ddbb5bd6b61463 (patch)
treea9ec402cbfbef1da3acde6071d992e2ade92ca8b /mojo/shell/tests/application_manager_apptest_driver.cc
parentd910911b407efde31709e3a766a5ee776db4c626 (diff)
downloadchromium_src-d414dc34a7f87a2000e09c58b9ddbb5bd6b61463.zip
chromium_src-d414dc34a7f87a2000e09c58b9ddbb5bd6b61463.tar.gz
chromium_src-d414dc34a7f87a2000e09c58b9ddbb5bd6b61463.tar.bz2
Rename WeakBindingSet/WeakInterfacePtrSet to BindingSet/InterfacePtrSet.
This CL also renames the element type (WeakBinding/WeakInterfacePtr) to Element and hide them in the corresonding *Set class. BUG=None CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation Committed: https://crrev.com/632d319842096e6998d174e2f251865979ce2b72 Cr-Commit-Position: refs/heads/master@{#377384} Review URL: https://codereview.chromium.org/1735583002 Cr-Commit-Position: refs/heads/master@{#377528}
Diffstat (limited to 'mojo/shell/tests/application_manager_apptest_driver.cc')
-rw-r--r--mojo/shell/tests/application_manager_apptest_driver.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/shell/tests/application_manager_apptest_driver.cc b/mojo/shell/tests/application_manager_apptest_driver.cc
index aad9660..2a820fe 100644
--- a/mojo/shell/tests/application_manager_apptest_driver.cc
+++ b/mojo/shell/tests/application_manager_apptest_driver.cc
@@ -21,7 +21,7 @@
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/public/cpp/bindings/weak_binding_set.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/public/cpp/connection.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "mojo/shell/public/cpp/shell.h"
@@ -136,7 +136,7 @@ class TargetApplicationDelegate : public mojo::ShellClient,
mojo::Shell* shell_;
base::Process target_;
- mojo::WeakBindingSet<Driver> bindings_;
+ mojo::BindingSet<Driver> bindings_;
base::WeakPtrFactory<TargetApplicationDelegate> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(TargetApplicationDelegate);