Convert string16 to base::string16 in content.

content/common/indexed_db/indexed_db_param_traits.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 "content/common/indexed_db/indexed_db_param_traits.h"
 
 #include <string>
 #include <vector>
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
@@ skipping 64 matching lines @@
       return true;
     }
     case WebIDBKeyTypeBinary: {
       std::string binary;
       if (!ReadParam(m, iter, &binary))
         return false;
       *r = IndexedDBKey(binary);
       return true;
     }
     case WebIDBKeyTypeString: {
-      string16 string;
+      base::string16 string;
       if (!ReadParam(m, iter, &string))
         return false;
       *r = IndexedDBKey(string);
       return true;
     }
     case WebIDBKeyTypeDate:
     case WebIDBKeyTypeNumber: {
       double number;
       if (!ReadParam(m, iter, &number))
         return false;
@@ skipping 53 matching lines @@
 
 bool ParamTraits<IndexedDBKeyPath>::Read(const Message* m,
                                          PickleIterator* iter,
                                          param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
 
   switch (type) {
     case WebIDBKeyPathTypeArray: {
-      std::vector<string16> array;
+      std::vector<base::string16> array;
       if (!ReadParam(m, iter, &array))
         return false;
       *r = IndexedDBKeyPath(array);
       return true;
     }
     case WebIDBKeyPathTypeString: {
-      string16 string;
+      base::string16 string;
       if (!ReadParam(m, iter, &string))
         return false;
       *r = IndexedDBKeyPath(string);
       return true;
     }
     case WebIDBKeyPathTypeNull:
       *r = IndexedDBKeyPath();
       return true;
   }
   NOTREACHED();
   return false;
 }
 
 void ParamTraits<IndexedDBKeyPath>::Log(const param_type& p, std::string* l) {
   l->append("<IndexedDBKeyPath>(");
   LogParam(static_cast<int>(p.type()), l);
   l->append(", ");
   LogParam(p.string(), l);
   l->append(", ");
   l->append("[");
-  std::vector<string16>::const_iterator it = p.array().begin();
+  std::vector<base::string16>::const_iterator it = p.array().begin();
   while (it != p.array().end()) {
     LogParam(*it, l);
     ++it;
     if (it != p.array().end())
       l->append(", ");
   }
   l->append("])");
 }
 
 void ParamTraits<IndexedDBKeyRange>::Write(Message* m, const param_type& p) {
@@ skipping 32 matching lines @@
   l->append(", upper=");
   LogParam(p.upper(), l);
   l->append(", lower_open=");
   LogParam(p.lowerOpen(), l);
   l->append(", upper_open=");
   LogParam(p.upperOpen(), l);
   l->append(")");
 }
 
 }  // namespace IPC