base: get rid of deprecated TrimWhitespace() function

chrome/browser/chromeos/power/cpu_data_collector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/power/cpu_data_collector.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 76 matching lines @@
   if (!base::PathExists(base::FilePath(cpu_online_file))) {
     // If the 'online' status file is missing, then it means that the CPU is
     // not hot-pluggable and hence is always online.
     return true;
   }
 
   int online;
   std::string cpu_online_string;
   if (base::ReadFileToString(base::FilePath(cpu_online_file),
                              &cpu_online_string)) {
-    base::TrimWhitespace(cpu_online_string, base::TRIM_ALL, &cpu_online_string);
+    base::TrimWhitespaceASCII(cpu_online_string, base::TRIM_ALL,
+                              &cpu_online_string);
     if (base::StringToInt(cpu_online_string, &online))
       return online == kCpuOnlineStatus;
   }
 
   LOG(ERROR) << "Bad format or error reading " << cpu_online_file << ". "
              << "Assuming offline.";
   return false;
 }
 
 // Samples the CPU idle state information from sysfs. |cpu_count| is the number
@@ skipping 44 matching lines @@
                                     &occupancy_time_string)) {
           // If an error occurs reading/parsing single state data, drop all the
           // samples as an incomplete sample can mislead consumers of this
           // sample.
           LOG(ERROR) << "Error reading idle state from "
                      << idle_state_dir << ". Dropping sample.";
           idle_samples->clear();
           return;
         }
 
-        base::TrimWhitespace(state_name, base::TRIM_ALL, &state_name);
-        base::TrimWhitespace(
-            occupancy_time_string, base::TRIM_ALL, &occupancy_time_string);
+        base::TrimWhitespaceASCII(state_name, base::TRIM_ALL, &state_name);
+        base::TrimWhitespaceASCII(occupancy_time_string, base::TRIM_ALL,
+                                  &occupancy_time_string);
         if (base::StringToInt64(occupancy_time_string, &occupancy_time_usec)) {
           // idle state occupancy time in sysfs is recorded in microseconds.
           int64 time_in_state_ms = occupancy_time_usec / 1000;
           size_t index = IndexInVector(state_name, cpu_idle_state_names);
           if (index >= idle_sample.time_in_state.size())
             idle_sample.time_in_state.resize(index + 1);
           idle_sample.time_in_state[index] = time_in_state_ms;
         } else {
           LOG(ERROR) << "Bad format in " << time_file_path << ". "
                      << "Dropping sample.";
@@ skipping 142 matching lines @@
     if (!base::PathExists(base::FilePath(possible_cpu_path))) {
       LOG(ERROR) << "File listing possible CPUs missing. "
                  << "Defaulting CPU count to 1.";
     } else {
       std::string possible_string;
       if (base::ReadFileToString(base::FilePath(possible_cpu_path),
                                  &possible_string)) {
         int max_cpu;
         // The possible CPUs are listed in the format "0-N". Hence, N is present
         // in the substring starting at offset 2.
-        base::TrimWhitespace(possible_string, base::TRIM_ALL, &possible_string);
+        base::TrimWhitespaceASCII(possible_string, base::TRIM_ALL,
+                                  &possible_string);
         if (possible_string.find("-") != std::string::npos &&
             possible_string.length() > 2 &&
             base::StringToInt(possible_string.substr(2), &max_cpu)) {
           *cpu_count = max_cpu + 1;
         } else {
           LOG(ERROR) << "Unknown format in the file listing possible CPUs. "
                      << "Defaulting CPU count to 1.";
         }
       } else {
         LOG(ERROR) << "Error reading the file listing possible CPUs. "
@@ skipping 97 matching lines @@
 }
 
 CpuDataCollector::StateOccupancySample::StateOccupancySample()
     : cpu_online(false) {
 }
 
 CpuDataCollector::StateOccupancySample::~StateOccupancySample() {
 }
 
 }  // namespace chromeos