Move more uses of string16 to specify base::

ipc/ipc_message_utils.cc

 // Copyright (c) 2012 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 "ipc/ipc_message_utils.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/nullable_string16.h"
@@ skipping 326 matching lines @@
 
 void ParamTraits<std::string>::Log(const param_type& p, std::string* l) {
   l->append(p);
 }
 
 void ParamTraits<std::wstring>::Log(const param_type& p, std::string* l) {
   l->append(WideToUTF8(p));
 }
 
 #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
 
 void ParamTraits<std::vector<char> >::Write(Message* m, const param_type& p) {
   if (p.empty()) {
     m->WriteData(NULL, 0);
   } else {
     m->WriteData(&p.front(), static_cast<int>(p.size()));
   }
@@ skipping 171 matching lines @@
 
 void ParamTraits<base::NullableString16>::Write(Message* m,
                                                 const param_type& p) {
   WriteParam(m, p.string());
   WriteParam(m, p.is_null());
 }
 
 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;
   if (!ReadParam(m, iter, &is_null))
     return false;
   *r = base::NullableString16(string, is_null);
   return true;
 }
 
 void ParamTraits<base::NullableString16>::Log(const param_type& p,
@@ skipping 273 matching lines @@
   return result;
 }
 
 void ParamTraits<MSG>::Log(const param_type& p, std::string* l) {
   l->append("<MSG>");
 }
 
 #endif  // OS_WIN
 
 }  // namespace IPC