diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 21:57:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 21:57:05 +0000 |
| commit | b20409af35ba1a15cd260567decb8ce9dca1d091 (patch) | |
| tree | 7f57ba7623a0cbf9621452f92e900095242090d5 /third_party/chromium/base/callback_unittest.cc | |
| parent | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (diff) | |
| parent | 83db8f75afbb37010450a6a5607764dedf20db6b (diff) | |
| download | libweave-b20409af35ba1a15cd260567decb8ce9dca1d091.tar.gz | |
Reland "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
am: 83db8f75af
* commit '83db8f75afbb37010450a6a5607764dedf20db6b':
Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: Idac2caa8eb2921e7ee9954a3896f936b793c99a7
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 bf9d76f..0d35a9d 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 { |