diff --git a/crash_reporter/kernel_collector.cc b/crash_reporter/kernel_collector.cc index 12b00b947..cb3a31504 100644 --- a/crash_reporter/kernel_collector.cc +++ b/crash_reporter/kernel_collector.cc @@ -68,8 +68,8 @@ const char* const kPCRegex[] = { " RIP \\[<.*>\\] ([^\\+ ]+).*", // X86_64 uses RIP for the program counter }; -COMPILE_ASSERT(arraysize(kPCRegex) == KernelCollector::kArchCount, - missing_arch_pc_regexp); +static_assert(arraysize(kPCRegex) == KernelCollector::kArchCount, + "Missing Arch PC regexp"); } // namespace diff --git a/crash_reporter/list_proxies.cc b/crash_reporter/list_proxies.cc index d445557b6..3374b5f87 100644 --- a/crash_reporter/list_proxies.cc +++ b/crash_reporter/list_proxies.cc @@ -75,13 +75,12 @@ std::vector ParseProxyString(const std::string& input) { // Start by finding the first space (if any). std::string::iterator space; for (space = token.begin(); space != token.end(); ++space) { - if (IsAsciiWhitespace(*space)) { + if (base::IsAsciiWhitespace(*space)) { break; } } - std::string scheme = std::string(token.begin(), space); - base::StringToLowerASCII(&scheme); + std::string scheme = base::ToLowerASCII(std::string(token.begin(), space)); // Chrome uses "socks" to mean socks4 and "proxy" to mean http. if (scheme == "socks") scheme += "4"; @@ -183,7 +182,7 @@ class ProxyResolver : public brillo::DBusDaemon { timeout_callback_.Cancel(); proxies_ = ParseProxyString(proxy_info); LOG(INFO) << "Found proxies via browser signal: " - << JoinString(proxies_, 'x'); + << base::JoinString(proxies_, "x"); Quit(); } diff --git a/crash_reporter/user_collector.cc b/crash_reporter/user_collector.cc index 6714f5239..98d7448f7 100644 --- a/crash_reporter/user_collector.cc +++ b/crash_reporter/user_collector.cc @@ -151,8 +151,8 @@ bool UserCollector::GetIdFromStatus( return false; } std::string id_substring = id_line.substr(strlen(prefix), std::string::npos); - std::vector ids; - base::SplitString(id_substring, '\t', &ids); + std::vector ids = base::SplitString( + id_substring, "\t", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); if (ids.size() != kIdMax || kind < 0 || kind >= kIdMax) { return false; } @@ -313,8 +313,8 @@ bool UserCollector::GetCreatedCrashDirectory(pid_t pid, uid_t supplied_ruid, uid_t uid; if (base::ReadFileToString(process_path.Append("status"), &status)) { - std::vector status_lines; - base::SplitString(status, '\n', &status_lines); + std::vector status_lines = base::SplitString( + status, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); std::string process_state; if (!GetStateFromStatus(status_lines, &process_state)) { diff --git a/crash_reporter/user_collector_test.cc b/crash_reporter/user_collector_test.cc index 638ea3490..c82271874 100644 --- a/crash_reporter/user_collector_test.cc +++ b/crash_reporter/user_collector_test.cc @@ -80,9 +80,8 @@ class UserCollectorTest : public ::testing::Test { } std::vector SplitLines(const std::string &lines) const { - std::vector result; - base::SplitString(lines, '\n', &result); - return result; + return base::SplitString(lines, "\n", base::TRIM_WHITESPACE, + base::SPLIT_WANT_ALL); } UserCollectorMock collector_; diff --git a/metricsd/collectors/cpu_usage_collector.cc b/metricsd/collectors/cpu_usage_collector.cc index 05934b47c..9b0bb3441 100644 --- a/metricsd/collectors/cpu_usage_collector.cc +++ b/metricsd/collectors/cpu_usage_collector.cc @@ -104,14 +104,15 @@ bool CpuUsageCollector::ParseProcStat(const std::string& stat_content, uint64_t *user_ticks, uint64_t *user_nice_ticks, uint64_t *system_ticks) { - std::vector proc_stat_lines; - base::SplitString(stat_content, '\n', &proc_stat_lines); + std::vector proc_stat_lines = base::SplitString( + stat_content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); if (proc_stat_lines.empty()) { LOG(WARNING) << "No lines found in " << kMetricsProcStatFileName; return false; } - std::vector proc_stat_totals; - base::SplitStringAlongWhitespace(proc_stat_lines[0], &proc_stat_totals); + std::vector proc_stat_totals = + base::SplitString(proc_stat_lines[0], base::kWhitespaceASCII, + base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); if (proc_stat_totals.size() != kMetricsProcStatFirstLineItemsCount || proc_stat_totals[0] != "cpu" || diff --git a/metricsd/metrics_collector.cc b/metricsd/metrics_collector.cc index 2cf23386c..ec7e04010 100644 --- a/metricsd/metrics_collector.cc +++ b/metricsd/metrics_collector.cc @@ -534,18 +534,20 @@ bool MetricsCollector::ProcessMeminfo(const string& meminfo_raw) { bool MetricsCollector::FillMeminfo(const string& meminfo_raw, vector* fields) { - vector lines; - unsigned int nlines = Tokenize(meminfo_raw, "\n", &lines); + vector lines = + base::SplitString(meminfo_raw, "\n", base::KEEP_WHITESPACE, + base::SPLIT_WANT_NONEMPTY); // Scan meminfo output and collect field values. Each field name has to // match a meminfo entry (case insensitive) after removing non-alpha // characters from the entry. - unsigned int ifield = 0; - for (unsigned int iline = 0; - iline < nlines && ifield < fields->size(); + size_t ifield = 0; + for (size_t iline = 0; + iline < lines.size() && ifield < fields->size(); iline++) { - vector tokens; - Tokenize(lines[iline], ": ", &tokens); + vector tokens = + base::SplitString(lines[iline], ": ", base::KEEP_WHITESPACE, + base::SPLIT_WANT_NONEMPTY); if (strcmp((*fields)[ifield].match, tokens[0].c_str()) == 0) { // Name matches. Parse value and save. if (!base::StringToInt(tokens[1], &(*fields)[ifield].value)) { diff --git a/metricsd/metrics_collector_main.cc b/metricsd/metrics_collector_main.cc index d7aaaf57e..14bb9352f 100644 --- a/metricsd/metrics_collector_main.cc +++ b/metricsd/metrics_collector_main.cc @@ -41,7 +41,8 @@ const std::string MetricsMainDiskStatsPath() { } dev_path = dev_path_cstr; // Check that rootdev begins with "/dev/block/". - if (!base::StartsWithASCII(dev_path, dev_prefix, false)) { + if (!base::StartsWith(dev_path, dev_prefix, + base::CompareCase::INSENSITIVE_ASCII)) { LOG(WARNING) << "unexpected root device " << dev_path; return ""; } diff --git a/metricsd/uploader/metricsd_service_runner.cc b/metricsd/uploader/metricsd_service_runner.cc index 283497793..5a759d35a 100644 --- a/metricsd/uploader/metricsd_service_runner.cc +++ b/metricsd/uploader/metricsd_service_runner.cc @@ -54,7 +54,7 @@ void MetricsdServiceRunner::Run() { void MetricsdServiceRunner::Stop() { message_loop_for_io_->PostTask(FROM_HERE, - message_loop_for_io_->QuitClosure()); + message_loop_for_io_->QuitWhenIdleClosure()); thread_->join(); }