Move more uses of string16 to specify base::

This makes base, ui, and net compile without the "using base::string16" directive that's currently checked in.

BUG=

Review URL: https://codereview.chromium.org/100303003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238246 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 95 insertions, 77 deletions

diff --git a/base/containers/hash_tables.h b/base/containers/hash_tables.h
index 2a2b52f..365b586 100644
--- a/base/containers/hash_tables.h
+++ b/base/containers/hash_tables.h
@@ -103,7 +103,7 @@ DEFINE_TRIVIAL_HASH(unsigned long long);
     }
 
 DEFINE_STRING_HASH(std::string);
-DEFINE_STRING_HASH(string16);
+DEFINE_STRING_HASH(base::string16);
 
 #undef DEFINE_STRING_HASH
 
diff --git a/base/file_version_info.h b/base/file_version_info.h
index 59cd45d..e18ba13 100644
--- a/base/file_version_info.h
+++ b/base/file_version_info.h
@@ -66,21 +66,21 @@ class FileVersionInfo {
 
   // Accessors to the different version properties.
   // Returns an empty string if the property is not found.
-  virtual string16 company_name() = 0;
-  virtual string16 company_short_name() = 0;
-  virtual string16 product_name() = 0;
-  virtual string16 product_short_name() = 0;
-  virtual string16 internal_name() = 0;
-  virtual string16 product_version() = 0;
-  virtual string16 private_build() = 0;
-  virtual string16 special_build() = 0;
-  virtual string16 comments() = 0;
-  virtual string16 original_filename() = 0;
-  virtual string16 file_description() = 0;
-  virtual string16 file_version() = 0;
-  virtual string16 legal_copyright() = 0;
-  virtual string16 legal_trademarks() = 0;
-  virtual string16 last_change() = 0;
+  virtual base::string16 company_name() = 0;
+  virtual base::string16 company_short_name() = 0;
+  virtual base::string16 product_name() = 0;
+  virtual base::string16 product_short_name() = 0;
+  virtual base::string16 internal_name() = 0;
+  virtual base::string16 product_version() = 0;
+  virtual base::string16 private_build() = 0;
+  virtual base::string16 special_build() = 0;
+  virtual base::string16 comments() = 0;
+  virtual base::string16 original_filename() = 0;
+  virtual base::string16 file_description() = 0;
+  virtual base::string16 file_version() = 0;
+  virtual base::string16 legal_copyright() = 0;
+  virtual base::string16 legal_trademarks() = 0;
+  virtual base::string16 last_change() = 0;
   virtual bool is_official_build() = 0;
 };
 
diff --git a/base/i18n/case_conversion_unittest.cc b/base/i18n/case_conversion_unittest.cc
index 2139bbe..38e2c68 100644
--- a/base/i18n/case_conversion_unittest.cc
+++ b/base/i18n/case_conversion_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace base {
 namespace {
 
 // Test upper and lower case string conversion.
@@ -24,3 +25,4 @@ TEST(CaseConversionTest, UpperLower) {
 // TODO(jshin): More tests are needed, especially with non-ASCII characters.
 
 }  // namespace
+}  // namespace base
diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc
index 4b2ca3a..9b05250 100644
--- a/base/i18n/file_util_icu.cc
+++ b/base/i18n/file_util_icu.cc
@@ -19,6 +19,8 @@
 #include "third_party/icu/source/common/unicode/uniset.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
 
+using base::string16;
+
 namespace {
 
 class IllegalCharacters {
diff --git a/base/i18n/file_util_icu.h b/base/i18n/file_util_icu.h
index 7f246c7..15526c3 100644
--- a/base/i18n/file_util_icu.h
+++ b/base/i18n/file_util_icu.h
@@ -15,7 +15,7 @@ namespace file_util {
 
 // Returns true if file_name does not have any illegal character. The input
 // param has the same restriction as that for ReplaceIllegalCharacters.
-BASE_I18N_EXPORT bool IsFilenameLegal(const string16& file_name);
+BASE_I18N_EXPORT bool IsFilenameLegal(const base::string16& file_name);
 
 // Replaces characters in 'file_name' that are illegal for file names with
 // 'replace_char'. 'file_name' must not be a full or relative path, but just the
diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc
index 3973dd2..917ba43 100644
--- a/base/i18n/time_formatting.cc
+++ b/base/i18n/time_formatting.cc
@@ -12,8 +12,7 @@
 #include "third_party/icu/source/i18n/unicode/dtptngen.h"
 #include "third_party/icu/source/i18n/unicode/smpdtfmt.h"
 
-using base::Time;
-
+namespace base {
 namespace {
 
 string16 TimeFormat(const icu::DateFormat* formatter,
@@ -48,8 +47,6 @@ string16 TimeFormatWithoutAmPm(const icu::DateFormat* formatter,
 
 }  // namespace
 
-namespace base {
-
 string16 TimeFormatTimeOfDay(const Time& time) {
   // We can omit the locale parameter because the default should match
   // Chrome's application locale.
diff --git a/base/pickle.cc b/base/pickle.cc
index 796fbc3..12a3237 100644
--- a/base/pickle.cc
+++ b/base/pickle.cc
@@ -10,6 +10,9 @@
 
 //------------------------------------------------------------------------------
 
+using base::char16;
+using base::string16;
+
 // static
 const int Pickle::kPayloadUnit = 64;
 
diff --git a/base/pickle.h b/base/pickle.h
index 3254837..dd34f54 100644
--- a/base/pickle.h
+++ b/base/pickle.h
@@ -37,7 +37,7 @@ class BASE_EXPORT PickleIterator {
   bool ReadFloat(float* result) WARN_UNUSED_RESULT;
   bool ReadString(std::string* result) WARN_UNUSED_RESULT;
   bool ReadWString(std::wstring* result) WARN_UNUSED_RESULT;
-  bool ReadString16(string16* result) WARN_UNUSED_RESULT;
+  bool ReadString16(base::string16* result) WARN_UNUSED_RESULT;
   bool ReadData(const char** data, int* length) WARN_UNUSED_RESULT;
   bool ReadBytes(const char** data, int length) WARN_UNUSED_RESULT;
 
@@ -179,7 +179,7 @@ class BASE_EXPORT Pickle {
     return iter->ReadWString(result);
   }
   bool ReadString16(PickleIterator* iter,
-                    string16* result) const WARN_UNUSED_RESULT {
+                    base::string16* result) const WARN_UNUSED_RESULT {
     return iter->ReadString16(result);
   }
   // A pointer to the data will be placed in *data, and the length will be
@@ -243,7 +243,7 @@ class BASE_EXPORT Pickle {
   }
   bool WriteString(const std::string& value);
   bool WriteWString(const std::wstring& value);
-  bool WriteString16(const string16& value);
+  bool WriteString16(const base::string16& value);
   // "Data" is a blob with a length. When you read it out you will be given the
   // length. See also WriteBytes.
   bool WriteData(const char* data, int length);
diff --git a/base/pickle_unittest.cc b/base/pickle_unittest.cc
index 6e9d41d..b1c5925 100644
--- a/base/pickle_unittest.cc
+++ b/base/pickle_unittest.cc
@@ -10,6 +10,9 @@
 #include "base/strings/string16.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+// Remove when this file is in the base namespace.
+using base::string16;
+
 namespace {
 
 const int testint = 2093847192;
diff --git a/base/strings/string16.cc b/base/strings/string16.cc
index c802eef..f4c8cf7 100644
--- a/base/strings/string16.cc
+++ b/base/strings/string16.cc
@@ -77,6 +77,6 @@ void PrintTo(const string16& str, std::ostream* out) {
 
 }  // namespace base
 
-template class std::basic_string<char16, base::string16_char_traits>;
+template class std::basic_string<base::char16, base::string16_char_traits>;
 
 #endif  // WCHAR_T_IS_UTF32
diff --git a/base/strings/string16_unittest.cc b/base/strings/string16_unittest.cc
index d98b2a9..4e58218 100644
--- a/base/strings/string16_unittest.cc
+++ b/base/strings/string16_unittest.cc
@@ -9,6 +9,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace base {
+
 #if defined(WCHAR_T_IS_UTF32)
 
 // We define a custom operator<< for string16 so we can use it with logging.
@@ -52,3 +54,5 @@ TEST(String16Test, OutputStream) {
 }
 
 #endif
+
+}  // namespace base
diff --git a/base/strings/string_util.cc b/base/strings/string_util.cc
index 4fa3f3f..1d85de8 100644
--- a/base/strings/string_util.cc
+++ b/base/strings/string_util.cc
@@ -26,6 +26,10 @@
 #include "base/third_party/icu/icu_utf.h"
 #include "build/build_config.h"
 
+// Remove when this entire file is in the base namespace.
+using base::char16;
+using base::string16;
+
 namespace {
 
 // Force the singleton used by Empty[W]String[16] to be a unique type. This
diff --git a/base/strings/string_util.h b/base/strings/string_util.h
index a6ee815..442db8e 100644
--- a/base/strings/string_util.h
+++ b/base/strings/string_util.h
@@ -161,9 +161,9 @@ BASE_EXPORT extern const char kUtf8ByteOrderMark[];
 // Removes characters in |remove_chars| from anywhere in |input|.  Returns true
 // if any characters were removed.  |remove_chars| must be null-terminated.
 // NOTE: Safe to use the same variable for both |input| and |output|.
-BASE_EXPORT bool RemoveChars(const string16& input,
-                             const char16 remove_chars[],
-                             string16* output);
+BASE_EXPORT bool RemoveChars(const base::string16& input,
+                             const base::char16 remove_chars[],
+                             base::string16* output);
 BASE_EXPORT bool RemoveChars(const std::string& input,
                              const char remove_chars[],
                              std::string* output);
@@ -173,10 +173,10 @@ BASE_EXPORT bool RemoveChars(const std::string& input,
 // the |replace_with| string.  Returns true if any characters were replaced.
 // |replace_chars| must be null-terminated.
 // NOTE: Safe to use the same variable for both |input| and |output|.
-BASE_EXPORT bool ReplaceChars(const string16& input,
-                              const char16 replace_chars[],
-                              const string16& replace_with,
-                              string16* output);
+BASE_EXPORT bool ReplaceChars(const base::string16& input,
+                              const base::char16 replace_chars[],
+                              const base::string16& replace_with,
+                              base::string16* output);
 BASE_EXPORT bool ReplaceChars(const std::string& input,
                               const char replace_chars[],
                               const std::string& replace_with,
@@ -185,9 +185,9 @@ BASE_EXPORT bool ReplaceChars(const std::string& input,
 // Removes characters in |trim_chars| from the beginning and end of |input|.
 // |trim_chars| must be null-terminated.
 // NOTE: Safe to use the same variable for both |input| and |output|.
-BASE_EXPORT bool TrimString(const string16& input,
-                            const char16 trim_chars[],
-                            string16* output);
+BASE_EXPORT bool TrimString(const base::string16& input,
+                            const base::char16 trim_chars[],
+                            base::string16* output);
 BASE_EXPORT bool TrimString(const std::string& input,
                             const char trim_chars[],
                             std::string* output);
@@ -211,9 +211,9 @@ enum TrimPositions {
   TRIM_TRAILING = 1 << 1,
   TRIM_ALL      = TRIM_LEADING | TRIM_TRAILING,
 };
-BASE_EXPORT TrimPositions TrimWhitespace(const string16& input,
+BASE_EXPORT TrimPositions TrimWhitespace(const base::string16& input,
                                          TrimPositions positions,
-                                         string16* output);
+                                         base::string16* output);
 BASE_EXPORT TrimPositions TrimWhitespaceASCII(const std::string& input,
                                               TrimPositions positions,
                                               std::string* output);
@@ -232,8 +232,8 @@ BASE_EXPORT TrimPositions TrimWhitespace(const std::string& input,
 // (2) If |trim_sequences_with_line_breaks| is true, any other whitespace
 //     sequences containing a CR or LF are trimmed.
 // (3) All other whitespace sequences are converted to single spaces.
-BASE_EXPORT string16 CollapseWhitespace(
-    const string16& text,
+BASE_EXPORT base::string16 CollapseWhitespace(
+    const base::string16& text,
     bool trim_sequences_with_line_breaks);
 BASE_EXPORT std::string CollapseWhitespaceASCII(
     const std::string& text,
@@ -242,19 +242,19 @@ BASE_EXPORT std::string CollapseWhitespaceASCII(
 // Returns true if the passed string is empty or contains only white-space
 // characters.
 BASE_EXPORT bool ContainsOnlyWhitespaceASCII(const std::string& str);
-BASE_EXPORT bool ContainsOnlyWhitespace(const string16& str);
+BASE_EXPORT bool ContainsOnlyWhitespace(const base::string16& str);
 
 // Returns true if |input| is empty or contains only characters found in
 // |characters|.
-BASE_EXPORT bool ContainsOnlyChars(const string16& input,
-                                   const string16& characters);
+BASE_EXPORT bool ContainsOnlyChars(const base::string16& input,
+                                   const base::string16& characters);
 BASE_EXPORT bool ContainsOnlyChars(const std::string& input,
                                    const std::string& characters);
 
 // Converts to 7-bit ASCII by truncating. The result must be known to be ASCII
 // beforehand.
 BASE_EXPORT std::string WideToASCII(const std::wstring& wide);
-BASE_EXPORT std::string UTF16ToASCII(const string16& utf16);
+BASE_EXPORT std::string UTF16ToASCII(const base::string16& utf16);
 
 // Returns true if the specified string matches the criteria. How can a wide
 // string be 8-bit or UTF8? It contains only characters that are < 256 (in the
@@ -269,7 +269,7 @@ BASE_EXPORT std::string UTF16ToASCII(const string16& utf16);
 // add a new function for that.
 BASE_EXPORT bool IsStringUTF8(const std::string& str);
 BASE_EXPORT bool IsStringASCII(const base::StringPiece& str);
-BASE_EXPORT bool IsStringASCII(const string16& str);
+BASE_EXPORT bool IsStringASCII(const base::string16& str);
 
 // Converts the elements of the given string.  This version uses a pointer to
 // clearly differentiate it from the non-pointer variant.
@@ -304,40 +304,40 @@ template <class str> inline str StringToUpperASCII(const str& s) {
 // token, and it is optimized to avoid intermediate string copies.  This API is
 // borrowed from the equivalent APIs in Mozilla.
 BASE_EXPORT bool LowerCaseEqualsASCII(const std::string& a, const char* b);
-BASE_EXPORT bool LowerCaseEqualsASCII(const string16& a, const char* b);
+BASE_EXPORT bool LowerCaseEqualsASCII(const base::string16& a, const char* b);
 
 // Same thing, but with string iterators instead.
 BASE_EXPORT bool LowerCaseEqualsASCII(std::string::const_iterator a_begin,
                                       std::string::const_iterator a_end,
                                       const char* b);
-BASE_EXPORT bool LowerCaseEqualsASCII(string16::const_iterator a_begin,
-                                      string16::const_iterator a_end,
+BASE_EXPORT bool LowerCaseEqualsASCII(base::string16::const_iterator a_begin,
+                                      base::string16::const_iterator a_end,
                                       const char* b);
 BASE_EXPORT bool LowerCaseEqualsASCII(const char* a_begin,
                                       const char* a_end,
                                       const char* b);
-BASE_EXPORT bool LowerCaseEqualsASCII(const char16* a_begin,
-                                      const char16* a_end,
+BASE_EXPORT bool LowerCaseEqualsASCII(const base::char16* a_begin,
+                                      const base::char16* a_end,
                                       const char* b);
 
 // Performs a case-sensitive string compare. The behavior is undefined if both
 // strings are not ASCII.
-BASE_EXPORT bool EqualsASCII(const string16& a, const base::StringPiece& b);
+BASE_EXPORT bool EqualsASCII(const base::string16& a, const base::StringPiece& b);
 
 // Returns true if str starts with search, or false otherwise.
 BASE_EXPORT bool StartsWithASCII(const std::string& str,
                                  const std::string& search,
                                  bool case_sensitive);
-BASE_EXPORT bool StartsWith(const string16& str,
-                            const string16& search,
+BASE_EXPORT bool StartsWith(const base::string16& str,
+                            const base::string16& search,
                             bool case_sensitive);
 
 // Returns true if str ends with search, or false otherwise.
 BASE_EXPORT bool EndsWith(const std::string& str,
                           const std::string& search,
                           bool case_sensitive);
-BASE_EXPORT bool EndsWith(const string16& str,
-                          const string16& search,
+BASE_EXPORT bool EndsWith(const base::string16& str,
+                          const base::string16& search,
                           bool case_sensitive);
 
 
@@ -384,15 +384,15 @@ inline bool IsWhitespace(wchar_t c) {
 // appropriate for use in any UI; use of FormatBytes and friends in ui/base is
 // highly recommended instead. TODO(avi): Figure out how to get callers to use
 // FormatBytes instead; remove this.
-BASE_EXPORT string16 FormatBytesUnlocalized(int64 bytes);
+BASE_EXPORT base::string16 FormatBytesUnlocalized(int64 bytes);
 
 // Starting at |start_offset| (usually 0), replace the first instance of
 // |find_this| with |replace_with|.
 BASE_EXPORT void ReplaceFirstSubstringAfterOffset(
-    string16* str,
-    string16::size_type start_offset,
-    const string16& find_this,
-    const string16& replace_with);
+    base::string16* str,
+    base::string16::size_type start_offset,
+    const base::string16& find_this,
+    const base::string16& replace_with);
 BASE_EXPORT void ReplaceFirstSubstringAfterOffset(
     std::string* str,
     std::string::size_type start_offset,
@@ -406,10 +406,10 @@ BASE_EXPORT void ReplaceFirstSubstringAfterOffset(
 // characters, for example:
 //   std::replace(str.begin(), str.end(), 'a', 'b');
 BASE_EXPORT void ReplaceSubstringsAfterOffset(
-    string16* str,
-    string16::size_type start_offset,
-    const string16& find_this,
-    const string16& replace_with);
+    base::string16* str,
+    base::string16::size_type start_offset,
+    const base::string16& find_this,
+    const base::string16& replace_with);
 BASE_EXPORT void ReplaceSubstringsAfterOffset(
     std::string* str,
     std::string::size_type start_offset,
@@ -450,9 +450,9 @@ inline typename string_type::value_type* WriteInto(string_type* str,
 // Splits a string into its fields delimited by any of the characters in
 // |delimiters|.  Each field is added to the |tokens| vector.  Returns the
 // number of tokens found.
-BASE_EXPORT size_t Tokenize(const string16& str,
-                            const string16& delimiters,
-                            std::vector<string16>* tokens);
+BASE_EXPORT size_t Tokenize(const base::string16& str,
+                            const base::string16& delimiters,
+                            std::vector<base::string16>* tokens);
 BASE_EXPORT size_t Tokenize(const std::string& str,
                             const std::string& delimiters,
                             std::vector<std::string>* tokens);
@@ -461,7 +461,8 @@ BASE_EXPORT size_t Tokenize(const base::StringPiece& str,
                             std::vector<base::StringPiece>* tokens);
 
 // Does the opposite of SplitString().
-BASE_EXPORT string16 JoinString(const std::vector<string16>& parts, char16 s);
+BASE_EXPORT base::string16 JoinString(const std::vector<base::string16>& parts,
+                                      base::char16 s);
 BASE_EXPORT std::string JoinString(
     const std::vector<std::string>& parts, char s);
 
@@ -469,17 +470,17 @@ BASE_EXPORT std::string JoinString(
 BASE_EXPORT std::string JoinString(
     const std::vector<std::string>& parts,
     const std::string& separator);
-BASE_EXPORT string16 JoinString(
-    const std::vector<string16>& parts,
-    const string16& separator);
+BASE_EXPORT base::string16 JoinString(
+    const std::vector<base::string16>& parts,
+    const base::string16& separator);
 
 // Replace $1-$2-$3..$9 in the format string with |a|-|b|-|c|..|i| respectively.
 // Additionally, any number of consecutive '$' characters is replaced by that
 // number less one. Eg $$->$, $$$->$$, etc. The offsets parameter here can be
 // NULL. This only allows you to use up to nine replacements.
-BASE_EXPORT string16 ReplaceStringPlaceholders(
-    const string16& format_string,
-    const std::vector<string16>& subst,
+BASE_EXPORT base::string16 ReplaceStringPlaceholders(
+    const base::string16& format_string,
+    const std::vector<base::string16>& subst,
     std::vector<size_t>* offsets);
 
 BASE_EXPORT std::string ReplaceStringPlaceholders(
@@ -488,9 +489,10 @@ BASE_EXPORT std::string ReplaceStringPlaceholders(
     std::vector<size_t>* offsets);
 
 // Single-string shortcut for ReplaceStringHolders. |offset| may be NULL.
-BASE_EXPORT string16 ReplaceStringPlaceholders(const string16& format_string,
-                                               const string16& a,
-                                               size_t* offset);
+BASE_EXPORT base::string16 ReplaceStringPlaceholders(
+    const base::string16& format_string,
+    const base::string16& a,
+    size_t* offset);
 
 // Returns true if the string passed in matches the pattern. The pattern
 // string can contain wildcards like * and ?
@@ -499,7 +501,8 @@ BASE_EXPORT string16 ReplaceStringPlaceholders(const string16& format_string,
 // ? matches 0 or 1 character, while * matches 0 or more characters.
 BASE_EXPORT bool MatchPattern(const base::StringPiece& string,
                               const base::StringPiece& pattern);
-BASE_EXPORT bool MatchPattern(const string16& string, const string16& pattern);
+BASE_EXPORT bool MatchPattern(const base::string16& string,
+                              const base::string16& pattern);
 
 // Hack to convert any char-like type to its unsigned counterpart.
 // For example, it will convert char, signed char and unsigned char to unsigned