diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-31 23:41:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 23:41:41 +0000 |
| commit | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (patch) | |
| tree | dd9041de1b74c6133fb3a07fcaa321de989b9668 /third_party/chromium/base/callback_unittest.cc | |
| parent | f91e999fb2dc8a70365471277e846e7b8e7b3284 (diff) | |
| parent | abfe7a063bbaebdca8703d27137c8c9aed826dac (diff) | |
| download | libweave-d77dfa0b5a854a80a586b89f13f602ee5a523d06.tar.gz | |
Revert "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'"
am: abfe7a063b
* commit 'abfe7a063bbaebdca8703d27137c8c9aed826dac':
Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: Id85d181a0a73598c6c4a3f397bd8085dd2c398e5
Diffstat (limited to 'third_party/chromium/base/callback_unittest.cc')
| -rw-r--r-- | third_party/chromium/base/callback_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/chromium/base/callback_unittest.cc b/third_party/chromium/base/callback_unittest.cc index 0d35a9d..bf9d76f 100644 --- a/third_party/chromium/base/callback_unittest.cc +++ b/third_party/chromium/base/callback_unittest.cc @@ -5,11 +5,11 @@ #include "base/callback.h" #include <gtest/gtest.h> -#include <memory> #include "base/bind.h" #include "base/callback_internal.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" namespace base { |