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/json/json_parser.h | |
| parent | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (diff) | |
| parent | 83db8f75afbb37010450a6a5607764dedf20db6b (diff) | |
| download | libweave-nougat-mr1-wear-release.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/json/json_parser.h')
| -rw-r--r-- | third_party/chromium/base/json/json_parser.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/chromium/base/json/json_parser.h b/third_party/chromium/base/json/json_parser.h index fc04594..5bdec58 100644 --- a/third_party/chromium/base/json/json_parser.h +++ b/third_party/chromium/base/json/json_parser.h @@ -8,6 +8,7 @@ #include <stddef.h> #include <stdint.h> +#include <memory> #include <string> #include "base/base_export.h" @@ -50,7 +51,7 @@ class BASE_EXPORT JSONParser { // Parses the input string according to the set options and returns the // result as a Value owned by the caller. - Value* Parse(const StringPiece& input); + std::unique_ptr<Value> Parse(StringPiece input); // Returns the error code. JSONReader::JsonParseError error_code() const; @@ -133,7 +134,7 @@ class BASE_EXPORT JSONParser { size_t length_; // The copied string representation. NULL until Convert() is called. - // Strong. scoped_ptr<T> has too much of an overhead here. + // Strong. std::unique_ptr<T> has too much of an overhead here. std::string* string_; }; |