diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-31 23:47:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 23:47:20 +0000 |
| commit | 24b97cc306d4834f865f9599b379e73e1b326ab8 (patch) | |
| tree | dd9041de1b74c6133fb3a07fcaa321de989b9668 /src/access_revocation_manager_impl.cc | |
| parent | 389403d79405277ec53c450eccf33a8174f74964 (diff) | |
| parent | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (diff) | |
| download | libweave-24b97cc306d4834f865f9599b379e73e1b326ab8.tar.gz | |
Revert "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'" am: abfe7a063b
am: d77dfa0b5a
* commit 'd77dfa0b5a854a80a586b89f13f602ee5a523d06':
Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: I0045e9f0eca8cb5701451c028b486e90477fe059
Diffstat (limited to 'src/access_revocation_manager_impl.cc')
| -rw-r--r-- | src/access_revocation_manager_impl.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/access_revocation_manager_impl.cc b/src/access_revocation_manager_impl.cc index 1c051de..93bdf3f 100644 --- a/src/access_revocation_manager_impl.cc +++ b/src/access_revocation_manager_impl.cc @@ -4,11 +4,8 @@ #include "src/access_revocation_manager_impl.h" -#include <memory> - #include <base/json/json_reader.h> #include <base/json/json_writer.h> -#include <base/memory/ptr_util.h> #include <base/values.h> #include "src/commands/schema_constants.h" @@ -73,8 +70,7 @@ void AccessRevocationManagerImpl::Save(const DoneCallback& callback) { base::ListValue list; for (const auto& e : entries_) { - std::unique_ptr<base::DictionaryValue> entry = - base::MakeUnique<base::DictionaryValue>(); + scoped_ptr<base::DictionaryValue> entry{new base::DictionaryValue}; entry->SetString(kUser, Base64Encode(e.user_id)); entry->SetString(kApp, Base64Encode(e.app_id)); entry->SetInteger(kRevocation, ToJ2000Time(e.revocation)); |