Tidy up the debugger.

services/tracing/tracing_app.cc

 // Copyright 2015 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.
 
 #include "services/tracing/tracing_app.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 
 namespace tracing {
 
-TracingApp::TracingApp() : collector_binding_(this), tracing_active_(false) {
-}
+TracingApp::TracingApp() : tracing_active_(false) {}
 
-TracingApp::~TracingApp() {
-}
+TracingApp::~TracingApp() {}
 
 bool TracingApp::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService<TraceCollector>(this);
 
   // If someone connects to us they may want to use the TraceCollector
   // interface and/or they may want to expose themselves to be traced. Attempt
   // to connect to the TraceProvider interface to see if the application
   // connecting to us wants to be traced. They can refuse the connection or
   // close the pipe if not.
   TraceProviderPtr provider_ptr;
   connection->ConnectToService(&provider_ptr);
   if (tracing_active_) {
     TraceRecorderPtr recorder_ptr;
     recorder_impls_.push_back(
         new TraceRecorderImpl(GetProxy(&recorder_ptr), sink_.get()));
     provider_ptr->StartTracing(tracing_categories_, recorder_ptr.Pass());
   }
   provider_ptrs_.AddInterfacePtr(provider_ptr.Pass());
   return true;
 }
 
 // mojo::InterfaceFactory<TraceCollector> implementation.
 void TracingApp::Create(mojo::ApplicationConnection* connection,
                         mojo::InterfaceRequest<TraceCollector> request) {
-  collector_binding_.Bind(request.Pass());
+  collector_bindings_.AddBinding(this, request.Pass());
 }
 
 // tracing::TraceCollector implementation.
 void TracingApp::Start(mojo::ScopedDataPipeProducerHandle stream,
                        const mojo::String& categories) {
   tracing_categories_ = categories;
   sink_.reset(new TraceDataSink(stream.Pass()));
   provider_ptrs_.ForAllPtrs([categories, this](TraceProvider* controller) {
     TraceRecorderPtr ptr;
     recorder_impls_.push_back(
@@ skipping 67 matching lines @@
   }
   AllDataCollected();
 }
 
 void TracingApp::AllDataCollected() {
   recorder_impls_.clear();
   sink_.reset();
 }
 
 }  // namespace tracing