Convert string16 to base::string16 in content.

content/common/mac/attributed_string_coder.mm

 // 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 "content/common/mac/attributed_string_coder.h"
 
 #include <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
@@ skipping 47 matching lines @@
       continue;
     }
     [decoded_string addAttributes:it->ToAttributesDictionary()
                             range:range.ToNSRange()];
   }
   return [decoded_string.release() autorelease];
 }
 
 // Data Types //////////////////////////////////////////////////////////////////
 
-AttributedStringCoder::EncodedString::EncodedString(string16 string)
+AttributedStringCoder::EncodedString::EncodedString(base::string16 string)
     : string_(string) {
 }
 
 AttributedStringCoder::EncodedString::EncodedString()
     : string_() {
 }
 
 AttributedStringCoder::EncodedString::~EncodedString() {
 }
 
@@ skipping 43 matching lines @@
 void ParamTraits<AttributedStringCoder::EncodedString>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.string());
   WriteParam(m, p.attributes());
 }
 
 bool ParamTraits<AttributedStringCoder::EncodedString>::Read(
     const Message* m, PickleIterator* iter, param_type* p) {
   bool success = true;
 
-  string16 result;
+  base::string16 result;
   success &= ReadParam(m, iter, &result);
   *p = AttributedStringCoder::EncodedString(result);
 
   success &= ReadParam(m, iter, p->attributes());
   return success;
 }
 
 void ParamTraits<AttributedStringCoder::EncodedString>::Log(
     const param_type& p, std::string* l) {
   l->append(UTF16ToUTF8(p.string()));
@@ skipping 19 matching lines @@
     *p = AttributedStringCoder::FontAttribute(font, range);
   }
   return success;
 }
 
 void ParamTraits<AttributedStringCoder::FontAttribute>::Log(
     const param_type& p, std::string* l) {
 }
 
 }  // namespace IPC