From f07ce4ed69c3c2624f4aae422d1ed62a8ac7a44c Mon Sep 17 00:00:00 2001 From: Alex Vakulenko Date: Wed, 20 Jan 2016 07:50:25 -0800 Subject: dbus-binding-generator: Update libchrome APIs to r369476 The new libchrome has been ported from Chromium and some APIs have changed. Make necessary changes at call sites. Change-Id: I792e854c58fadce96e153e081fc8fc6e129da6dc --- chromeos-dbus-bindings/header_generator.cc | 4 ++-- chromeos-dbus-bindings/indented_text.cc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/chromeos-dbus-bindings/header_generator.cc b/chromeos-dbus-bindings/header_generator.cc index d69cd1c..6989ffa 100644 --- a/chromeos-dbus-bindings/header_generator.cc +++ b/chromeos-dbus-bindings/header_generator.cc @@ -25,9 +25,9 @@ string HeaderGenerator::GenerateHeaderGuard( string guard = base::StringPrintf("____chromeos_dbus_binding__%s", output_file.value().c_str()); for (auto& c : guard) { - if (IsAsciiAlpha(c)) { + if (base::IsAsciiAlpha(c)) { c = base::ToUpperASCII(c); - } else if (!IsAsciiDigit(c)) { + } else if (!base::IsAsciiDigit(c)) { c = '_'; } } diff --git a/chromeos-dbus-bindings/indented_text.cc b/chromeos-dbus-bindings/indented_text.cc index 2af6419..8831bf9 100644 --- a/chromeos-dbus-bindings/indented_text.cc +++ b/chromeos-dbus-bindings/indented_text.cc @@ -76,7 +76,8 @@ void IndentedText::AddComments(const std::string& doc_string) { lines_out.push_back(line.substr(pos)); } } else { - if (base::StartsWithASCII(line, trim_prefix, false)) { + if (base::StartsWith(line, trim_prefix, + base::CompareCase::INSENSITIVE_ASCII)) { line = line.substr(trim_prefix.length()); } else { base::TrimWhitespaceASCII(line, base::TRIM_LEADING, &line); -- cgit v1.2.3