Index: mojo/services/tracing/tracing_app.h |
diff --git a/mojo/services/tracing/tracing_app.h b/mojo/services/tracing/tracing_app.h |
index edb189ef530221f11adadeed61b6ea5ad607a766..f4098872c88c6e4dadb1e92accc0c45575d79380 100644 |
--- a/mojo/services/tracing/tracing_app.h |
+++ b/mojo/services/tracing/tracing_app.h |
@@ -10,9 +10,9 @@ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
+#include "mojo/public/cpp/bindings/binding_set.h" |
+#include "mojo/public/cpp/bindings/interface_ptr_set.h" |
#include "mojo/public/cpp/bindings/strong_binding.h" |
-#include "mojo/public/cpp/bindings/weak_binding_set.h" |
-#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h" |
#include "mojo/services/tracing/public/interfaces/tracing.mojom.h" |
#include "mojo/services/tracing/trace_data_sink.h" |
#include "mojo/services/tracing/trace_recorder_impl.h" |
@@ -64,9 +64,9 @@ class TracingApp |
scoped_ptr<TraceDataSink> sink_; |
ScopedVector<TraceRecorderImpl> recorder_impls_; |
- mojo::WeakInterfacePtrSet<TraceProvider> provider_ptrs_; |
+ mojo::InterfacePtrSet<TraceProvider> provider_ptrs_; |
mojo::Binding<TraceCollector> collector_binding_; |
- mojo::WeakBindingSet<StartupPerformanceDataCollector> |
+ mojo::BindingSet<StartupPerformanceDataCollector> |
startup_performance_data_collector_bindings_; |
StartupPerformanceTimes startup_performance_times_; |
bool tracing_active_; |