Update update engine to compile and use libchrome-180609.
Made the following fixes:
- base/eintr_wrapper.h -> base/posix/eintr_wrapper.h
- base/string_tokenizer.h -> base/strings/string_tokenizer.h
- Switched JSONReader->JsonToValue to use JSONReader->ReadToValue.
BUG=chromium-os:39847
TEST=unittests + run through image_to_live
Change-Id: Iffa0a3af4a065fac40460d8c1c2ed5c9b6e9ed07
Reviewed-on: https://gerrit.chromium.org/gerrit/44098
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>
diff --git a/chrome_proxy_resolver.cc b/chrome_proxy_resolver.cc
index 25af4f6..2c1c1ca 100644
--- a/chrome_proxy_resolver.cc
+++ b/chrome_proxy_resolver.cc
@@ -111,10 +111,7 @@
std::deque<std::string>* out_proxies) {
base::JSONReader parser;
- scoped_ptr<Value> root(
- parser.JsonToValue(json_settings,
- true, // check root is obj/arr
- false)); // false = disallow trailing comma
+ scoped_ptr<Value> root(parser.ReadToValue(json_settings));
if (!root.get()) {
LOG(ERROR) << "Unable to parse \"" << json_settings << "\": "
<< parser.GetErrorMessage();