diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 02:04:04 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 02:04:04 +0000 |
| commit | 1c232c2bbc955bd58282cd815bc0fcc2bcf66aa1 (patch) | |
| tree | 0ab63673a38ea13eb0659e48d542e49867062f50 /tools/android | |
| parent | 85267b1f29294369994453d2b459b252db1fe556 (diff) | |
| download | chromium_src-1c232c2bbc955bd58282cd815bc0fcc2bcf66aa1.zip chromium_src-1c232c2bbc955bd58282cd815bc0fcc2bcf66aa1.tar.gz chromium_src-1c232c2bbc955bd58282cd815bc0fcc2bcf66aa1.tar.bz2 | |
Move ScopedClosureRunner to callback_helpers, add Reset.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23514018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/forwarder2/device_controller.cc | 2 | ||||
| -rw-r--r-- | tools/android/memdump/memdump.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/android/forwarder2/device_controller.cc b/tools/android/forwarder2/device_controller.cc index 87d0e17..a6d370b 100644 --- a/tools/android/forwarder2/device_controller.cc +++ b/tools/android/forwarder2/device_controller.cc @@ -7,7 +7,7 @@ #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" diff --git a/tools/android/memdump/memdump.cc b/tools/android/memdump/memdump.cc index 26035b2..42ade35 100644 --- a/tools/android/memdump/memdump.cc +++ b/tools/android/memdump/memdump.cc @@ -19,7 +19,7 @@ #include "base/base64.h" #include "base/basictypes.h" #include "base/bind.h" -#include "base/bind_helpers.h" +#include "base/callback_helpers.h" #include "base/containers/hash_tables.h" #include "base/file_util.h" #include "base/logging.h" |