| Index: services/tracing/tracing_app.h
|
| diff --git a/services/tracing/tracing_app.h b/services/tracing/tracing_app.h
|
| index 5eb69ea07f3cc2d9c3548a3feae4889647ae6750..fc9a52bbae399492c9760fb42a8eae6dfd8cf5ea 100644
|
| --- a/services/tracing/tracing_app.h
|
| +++ b/services/tracing/tracing_app.h
|
| @@ -8,8 +8,8 @@
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| +#include "mojo/common/interface_ptr_set.h"
|
| #include "mojo/common/weak_binding_set.h"
|
| -#include "mojo/common/weak_interface_ptr_set.h"
|
| #include "mojo/public/cpp/application/application_delegate.h"
|
| #include "mojo/public/cpp/application/application_impl.h"
|
| #include "mojo/public/cpp/bindings/strong_binding.h"
|
| @@ -44,7 +44,7 @@ class TracingApp : public mojo::ApplicationDelegate,
|
|
|
| scoped_ptr<TraceDataSink> sink_;
|
| ScopedVector<CollectorImpl> collector_impls_;
|
| - mojo::WeakInterfacePtrSet<TraceController> controller_ptrs_;
|
| + mojo::InterfacePtrSet<TraceController> controller_ptrs_;
|
| mojo::Binding<TraceCoordinator> coordinator_binding_;
|
| bool tracing_active_;
|
| mojo::String tracing_categories_;
|
|
|