Move RemoveChars, ReplaceChars, TrimString, and TruncateUTF8ToByteSize to base namespace.

chrome/browser/chromeos/login/hwid_checker.cc

 // Copyright (c) 2013 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/login/hwid_checker.h"
 
 #include <cstdio>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
 
 bool IsCorrectExceptionalHWID(const std::string& hwid) {
   if (!IsExceptionalHWID(hwid))
     return false;
   std::string bom;
   if (!RE2::FullMatch(hwid, "[A-Z0-9]+ ((?:[A-Z2-7]{4}-)*[A-Z2-7]{1,4})", &bom))
     return false;
   if (bom.length() < 2)
     return false;
   std::string hwid_without_dashes;
-  RemoveChars(hwid, "-", &hwid_without_dashes);
+  base::RemoveChars(hwid, "-", &hwid_without_dashes);
   LOG_ASSERT(hwid_without_dashes.length() >= 2);
   std::string not_checksum =
       hwid_without_dashes.substr(0, hwid_without_dashes.length() - 2);
   std::string checksum =
       hwid_without_dashes.substr(hwid_without_dashes.length() - 2);
   return CalculateExceptionalHWIDChecksum(not_checksum) == checksum;
 }
 
 std::string CalculateHWIDv3Checksum(const std::string& data) {
   static const char base8_alphabet[] = "23456789";
   static const char base32_alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
   unsigned crc32 = CalculateCRC32(data);
   // We take 8 least significant bits of CRC-32 and encode them in 2 characters.
   std::string checksum;
   checksum += base8_alphabet[(crc32 >> 5) & 0x7];
   checksum += base32_alphabet[crc32 & 0x1f];
   return checksum;
 }
 
 bool IsCorrectHWIDv3(const std::string& hwid) {
   if (IsExceptionalHWID(hwid))
     return false;
   std::string regex =
       "([A-Z0-9]+ (?:[A-Z2-7][2-9][A-Z2-7]-)*[A-Z2-7])([2-9][A-Z2-7])";
   std::string not_checksum, checksum;
   if (!RE2::FullMatch(hwid, regex, &not_checksum, &checksum))
     return false;
-  RemoveChars(not_checksum, "-", &not_checksum);
+  base::RemoveChars(not_checksum, "-", &not_checksum);
   return CalculateHWIDv3Checksum(not_checksum) == checksum;
 }
 
 } // anonymous namespace
 
 namespace chromeos {
 
 bool IsHWIDCorrect(const std::string& hwid) {
   return IsCorrectHWIDv2(hwid) || IsCorrectExceptionalHWID(hwid) ||
       IsCorrectHWIDv3(hwid);
@@ skipping 17 matching lines @@
     return false;
   }
   if (!chromeos::IsHWIDCorrect(hwid)) {
     LOG(ERROR) << "Machine has malformed HWID '" << hwid << "'.";
     return false;
   }
   return true;
 }
 
 } // namespace chromeos