Add Reset to ScopedClosureRunner.

tools/android/forwarder2/device_controller.cc

 // Copyright (c) 2012 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 "tools/android/forwarder2/device_controller.h"
 
 #include <utility>
 
 #include "base/bind.h"
-#include "base/bind_helpers.h"
+#include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
 #include "tools/android/forwarder2/command.h"
 #include "tools/android/forwarder2/device_listener.h"
 #include "tools/android/forwarder2/socket.h"
 
 namespace forwarder2 {
 
@@ skipping 124 matching lines @@
       listener_port);
   if (listener_it == controller->listeners_.end())
     return;
   const linked_ptr<DeviceListener> listener = listener_it->second;
   // Note that the listener is removed from the map before it gets destroyed in
   // case its destructor would access the map.
   controller->listeners_.erase(listener_it);
 }
 
 }  // namespace forwarder