Convert string16 to base::string16 in content.

content/common/mac/attributed_string_coder.h

 // 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.
 
 #ifndef CONTENT_COMMON_MAC_ATTRIBUTED_STRING_CODER_H_
 #define CONTENT_COMMON_MAC_ATTRIBUTED_STRING_CODER_H_
 
 #include <set>
 
 #include "base/strings/string16.h"
@@ skipping 44 matching lines @@
 
    private:
     FontDescriptor font_descriptor_;
     gfx::Range effective_range_;
   };
 
   // A class that contains the pertinent information from an NSAttributedString,
   // which can be serialized over IPC.
   class EncodedString {
    public:
-    explicit EncodedString(string16 string);
+    explicit EncodedString(base::string16 string);
     EncodedString();
     ~EncodedString();
 
     // Accessors:
-    string16 string() const { return string_; }
+    base::string16 string() const { return string_; }
     const std::vector<FontAttribute>& attributes() const {
       return attributes_;
     }
     std::vector<FontAttribute>* attributes() { return &attributes_; }
 
    private:
     // The plain-text string.
-    string16 string_;
+    base::string16 string_;
     // The set of attributes that style |string_|.
     std::vector<FontAttribute> attributes_;
   };
 
   // Takes an NSAttributedString, extracts the pertinent attributes, and returns
   // an object that represents it. Caller owns the result.
   static const EncodedString* Encode(NSAttributedString* str);
 
   // Returns an autoreleased NSAttributedString from an encoded representation.
   static NSAttributedString* Decode(const EncodedString* str);
@@ skipping 20 matching lines @@
 struct ParamTraits<mac::AttributedStringCoder::FontAttribute> {
   typedef mac::AttributedStringCoder::FontAttribute param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 }  // namespace IPC
 
 #endif  // CONTENT_COMMON_MAC_ATTRIBUTED_STRING_CODER_H_