Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace.

components/webdata/encryptor/encryptor_unittest.cc

 // Copyright (c) 2010 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 "components/webdata/encryptor/encryptor.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 21 matching lines @@
   std::string utf8_plaintext;
   std::string utf8_result;
   std::string ciphertext;
 
   // Test borderline cases (empty strings).
   EXPECT_TRUE(Encryptor::EncryptString16(plaintext, &ciphertext));
   EXPECT_TRUE(Encryptor::DecryptString16(ciphertext, &result));
   EXPECT_EQ(plaintext, result);
 
   // Test a simple string.
-  plaintext = ASCIIToUTF16("hello");
+  plaintext = base::ASCIIToUTF16("hello");
   EXPECT_TRUE(Encryptor::EncryptString16(plaintext, &ciphertext));
   EXPECT_TRUE(Encryptor::DecryptString16(ciphertext, &result));
   EXPECT_EQ(plaintext, result);
 
   // Test a 16-byte aligned string.  This previously hit a boundary error in
   // base::Encryptor::Crypt() on Mac.
-  plaintext = ASCIIToUTF16("1234567890123456");
+  plaintext = base::ASCIIToUTF16("1234567890123456");
   EXPECT_TRUE(Encryptor::EncryptString16(plaintext, &ciphertext));
   EXPECT_TRUE(Encryptor::DecryptString16(ciphertext, &result));
   EXPECT_EQ(plaintext, result);
 
   // Test Unicode.
   char16 wchars[] = { 0xdbeb, 0xdf1b, 0x4e03, 0x6708, 0x8849,
                       0x661f, 0x671f, 0x56db, 0x597c, 0x4e03,
                       0x6708, 0x56db, 0x6708, 0xe407, 0xdbaf,
                       0xdeb5, 0x4ec5, 0x544b, 0x661f, 0x671f,
                       0x65e5, 0x661f, 0x671f, 0x4e94, 0xd8b1,
                       0xdce1, 0x7052, 0x5095, 0x7c0b, 0xe586, 0};
   plaintext = wchars;
-  utf8_plaintext = UTF16ToUTF8(plaintext);
-  EXPECT_EQ(plaintext, UTF8ToUTF16(utf8_plaintext));
+  utf8_plaintext = base::UTF16ToUTF8(plaintext);
+  EXPECT_EQ(plaintext, base::UTF8ToUTF16(utf8_plaintext));
   EXPECT_TRUE(Encryptor::EncryptString16(plaintext, &ciphertext));
   EXPECT_TRUE(Encryptor::DecryptString16(ciphertext, &result));
   EXPECT_EQ(plaintext, result);
   EXPECT_TRUE(Encryptor::DecryptString(ciphertext, &utf8_result));
-  EXPECT_EQ(utf8_plaintext, UTF16ToUTF8(result));
+  EXPECT_EQ(utf8_plaintext, base::UTF16ToUTF8(result));
 
   EXPECT_TRUE(Encryptor::EncryptString(utf8_plaintext, &ciphertext));
   EXPECT_TRUE(Encryptor::DecryptString16(ciphertext, &result));
   EXPECT_EQ(plaintext, result);
   EXPECT_TRUE(Encryptor::DecryptString(ciphertext, &utf8_result));
-  EXPECT_EQ(utf8_plaintext, UTF16ToUTF8(result));
+  EXPECT_EQ(utf8_plaintext, base::UTF16ToUTF8(result));
 }
 
 TEST_F(EncryptorTest, EncryptionDecryption) {
   std::string plaintext;
   std::string result;
   std::string ciphertext;
 
   // Test borderline cases (empty strings).
   ASSERT_TRUE(Encryptor::EncryptString(plaintext, &ciphertext));
   ASSERT_TRUE(Encryptor::DecryptString(ciphertext, &result));
@@ skipping 49 matching lines @@
   ASSERT_TRUE(Encryptor::EncryptString(plaintext, &ciphertext));
   EXPECT_NE(plaintext, ciphertext);
   ASSERT_LT(4UL, ciphertext.size());
   ciphertext[3] = ciphertext[3] + 1;
   EXPECT_FALSE(Encryptor::DecryptString(ciphertext, &result));
   EXPECT_NE(plaintext, result);
   EXPECT_TRUE(result.empty());
 }
 
 }  // namespace