base/i18n: Add namespace i18n to CharIterator.

base/i18n/char_iterator_unittest.cc

Index: base/i18n/char_iterator_unittest.cc
diff --git a/base/i18n/char_iterator_unittest.cc b/base/i18n/char_iterator_unittest.cc
index 4fe7ebb5d0325f601f786acec4031681ba15febd..c22dce6d81a88f6290d6c5464afd901f62ad0291 100644
--- a/base/i18n/char_iterator_unittest.cc
+++ b/base/i18n/char_iterator_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -9,14 +9,14 @@
 
 TEST(CharIteratorsTest, TestUTF8) {
   std::string empty("");
-  base::UTF8CharIterator empty_iter(&empty);
+  base::i18n::UTF8CharIterator empty_iter(&empty);

[brettw, 2011/01/18 18:36:10]

I'd just put this entire file in the base::i18n namespace and remove all of the
explicit namespace usage.

[tfarina, 2011/01/18 18:42:04]

Done.

   ASSERT_TRUE(empty_iter.end());
   ASSERT_EQ(0, empty_iter.array_pos());
   ASSERT_EQ(0, empty_iter.char_pos());
   ASSERT_FALSE(empty_iter.Advance());
 
   std::string str("s\303\273r");  // [u with circumflex]
-  base::UTF8CharIterator iter(&str);
+  base::i18n::UTF8CharIterator iter(&str);
   ASSERT_FALSE(iter.end());
   ASSERT_EQ(0, iter.array_pos());
   ASSERT_EQ(0, iter.char_pos());
@@ -47,7 +47,7 @@ TEST(CharIteratorsTest, TestUTF8) {
 
 TEST(CharIteratorsTest, TestUTF16) {
   string16 empty = UTF8ToUTF16("");
-  base::UTF16CharIterator empty_iter(&empty);
+  base::i18n::UTF16CharIterator empty_iter(&empty);
   ASSERT_TRUE(empty_iter.end());
   ASSERT_EQ(0, empty_iter.array_pos());
   ASSERT_EQ(0, empty_iter.char_pos());
@@ -59,7 +59,7 @@ TEST(CharIteratorsTest, TestUTF16) {
   //   math double-struck A - 4 bytes in UTF8, 2 codewords in UTF16
   //   z
   string16 str = UTF8ToUTF16("x\303\273\360\235\224\270z");
-  base::UTF16CharIterator iter(&str);
+  base::i18n::UTF16CharIterator iter(&str);
   ASSERT_FALSE(iter.end());
   ASSERT_EQ(0, iter.array_pos());
   ASSERT_EQ(0, iter.char_pos());