summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@chromium.org>2015-06-15 12:53:22 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-06-17 17:34:39 +0000
commit0bd7dd71a61171d9609ecc7722e8fd87e0afdda2 (patch)
treefbcf43feef76275a01a3d2ae016052b767187b0a
parent6cc1d5b99f6994832595c4d0a788972e65a6ef54 (diff)
downloaddbus-binding-generator-0bd7dd71a61171d9609ecc7722e8fd87e0afdda2.tar.gz
platform2: Fix issues with new version of libchrome
libchrome r334380 has the following breaking changes that need to be fixed: - base::JSONWriter::Write() and base::JSONWriter::WriteWithOptions() take "const base::Value&" instead of "const base::Value*" - base::JSONReader::Read() and base::JSONReader::ReadAndReturnError() return a scoped_ptr<base::Value> instead of base::Value* - base/safe_strerror_posix.h is moved to base/posix/safe_strerror.h - safe_strerror() is now in "base" namespace - StartsWithASCII(), EndsWith(), StringToUpperASCII(), LowerCaseEqualsASCII() are now in "base" namespace - ObserverList<T> is now in "base" namespace - base::PrintTo(base::FilePath) used in gtest is now moved to libchrome-test library and as such, unit test runners need to link to this library now. - crypto::RSAPrivateKey::CreateSensitive() is now removed from //crypto, so some of tests in chromeos-login that used that function had to be changed to use crypto::GenerateRSAKeyPairNSS() directly. - UnixDomanSocket class is now in "base" namespace - Pickle class is now in "base" namespace BUG=chromium:496469 TEST=`./build_packages` CQ-DEPEND=CL:277662 Change-Id: I36e5fbf2e36a92068873ffbd44020c862a3ed9e3 Reviewed-on: https://chromium-review.googlesource.com/277671 Reviewed-by: Alex Vakulenko <avakulenko@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org> Trybot-Ready: Alex Vakulenko <avakulenko@chromium.org> Tested-by: Alex Vakulenko <avakulenko@chromium.org>
-rw-r--r--chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc2
-rw-r--r--chromeos-dbus-bindings/indented_text.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc b/chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc
index a748843..dd67a3c 100644
--- a/chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc
+++ b/chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc
@@ -78,7 +78,7 @@ bool LoadConfig(const base::FilePath& path, ServiceConfig *config) {
if (!base::ReadFileToString(path, &contents))
return false;
- std::unique_ptr<base::Value> json{base::JSONReader::Read(contents)};
+ std::unique_ptr<base::Value> json{base::JSONReader::Read(contents).release()};
if (!json)
return false;
diff --git a/chromeos-dbus-bindings/indented_text.cc b/chromeos-dbus-bindings/indented_text.cc
index 97e1875..1feb265 100644
--- a/chromeos-dbus-bindings/indented_text.cc
+++ b/chromeos-dbus-bindings/indented_text.cc
@@ -76,7 +76,7 @@ void IndentedText::AddComments(const std::string& doc_string) {
lines_out.push_back(line.substr(pos));
}
} else {
- if (StartsWithASCII(line, trim_prefix, false)) {
+ if (base::StartsWithASCII(line, trim_prefix, false)) {
line = line.substr(trim_prefix.length());
} else {
base::TrimWhitespaceASCII(line, base::TRIM_LEADING, &line);