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

2 files changed, 4 insertions, 4 deletions

diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index c5ace24..0390648 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -344,7 +344,7 @@ void ParamTraits<std::wstring>::Log(const param_type& p, std::string* l) {
 }
 
 #if !defined(WCHAR_T_IS_UTF16)
-void ParamTraits<string16>::Log(const param_type& p, std::string* l) {
+void ParamTraits<base::string16>::Log(const param_type& p, std::string* l) {
   l->append(UTF16ToUTF8(p));
 }
 #endif
@@ -536,7 +536,7 @@ void ParamTraits<base::NullableString16>::Write(Message* m,
 bool ParamTraits<base::NullableString16>::Read(const Message* m,
                                                PickleIterator* iter,
                                                param_type* r) {
-  string16 string;
+  base::string16 string;
   if (!ReadParam(m, iter, &string))
     return false;
   bool is_null;
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index e9c0ba0b0..24b38af 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -265,8 +265,8 @@ struct ParamTraits<std::wstring> {
 // need this trait.
 #if !defined(WCHAR_T_IS_UTF16)
 template <>
-struct ParamTraits<string16> {
-  typedef string16 param_type;
+struct ParamTraits<base::string16> {
+  typedef base::string16 param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteString16(p);
   }