summaryrefslogtreecommitdiff
path: root/dbus/values_util.h
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2016-07-15 16:23:21 -0700
committerTreehugger Robot <treehugger-gerrit@google.com>2016-07-27 16:41:28 +0000
commit0c4f26a46430b8c503c65f5cae1d2b6876d53e30 (patch)
treefb97dc88b72d681efeb9cfa1b8693a6183180ad9 /dbus/values_util.h
parent0cfccb799ce68cc66d389e6885f8d73f95ee5c4f (diff)
downloadlibchrome-0c4f26a46430b8c503c65f5cae1d2b6876d53e30.tar.gz
libchrome: Uprev the library to r405848 from Chromium
Pulled the latest and greatest version of libchrome from Chromium. The merge was done against r405848 which corresponds to git commit 909e5d3ecab27bb09cc570c1c215d0221bd6fe53 of Jul 15, 2016 Notable changes are: - base::Bind() now explicitly disallows captures in lambdas (which was never allowed in the style guide). - base::ListValue::iterator now exposes std::unique_ptr<base::Value> instead of raw base::Value*. BUG: 29104761 TEST: All tests in libchrome_test pass on dragonboard-eng build Change-Id: I94b285a3be074efa30c4e71ae93c8f2a99fb0b87
Diffstat (limited to 'dbus/values_util.h')
-rw-r--r--dbus/values_util.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/dbus/values_util.h b/dbus/values_util.h
index b6f4ff3b10..81b839b188 100644
--- a/dbus/values_util.h
+++ b/dbus/values_util.h
@@ -7,6 +7,8 @@
#include <stdint.h>
+#include <memory>
+
#include "dbus/dbus_export.h"
namespace base {
@@ -22,7 +24,8 @@ class MessageWriter;
// Returns NULL if an error occurs.
// Note: Integer values larger than int32_t (including uint32_t) are converted
// to double. Non-string dictionary keys are converted to strings.
-CHROME_DBUS_EXPORT base::Value* PopDataAsValue(MessageReader* reader);
+CHROME_DBUS_EXPORT std::unique_ptr<base::Value> PopDataAsValue(
+ MessageReader* reader);
// Appends a basic type value to |writer|. Basic types are BOOLEAN, INTEGER,
// DOUBLE, and STRING. Use this function for values that are known to be basic