Convert string16 to base::string16 in content.

google_apis/gaia/oauth2_mint_token_flow.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 "google_apis/gaia/oauth2_mint_token_flow.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 240 matching lines @@
     return false;
 
   const base::ListValue* scopes_list = NULL;
   if (!consent_dict->GetList(kScopesKey, &scopes_list))
     return false;
 
   bool success = true;
   for (size_t index = 0; index < scopes_list->GetSize(); ++index) {
     const base::DictionaryValue* scopes_entry = NULL;
     IssueAdviceInfoEntry entry;
-    string16 detail;
+    base::string16 detail;
     if (!scopes_list->GetDictionary(index, &scopes_entry) ||
         !scopes_entry->GetString(kDescriptionKey, &entry.description) ||
         !scopes_entry->GetString(kDetailKey, &detail)) {
       success = false;
       break;
     }
 
     TrimWhitespace(entry.description, TRIM_ALL, &entry.description);
-    static const string16 detail_separators = ASCIIToUTF16(kDetailSeparators);
+    static const base::string16 detail_separators =
+        ASCIIToUTF16(kDetailSeparators);
     Tokenize(detail, detail_separators, &entry.details);
     for (size_t i = 0; i < entry.details.size(); i++)
       TrimWhitespace(entry.details[i], TRIM_ALL, &entry.details[i]);
     issue_advice->push_back(entry);
   }
 
   if (!success)
     issue_advice->clear();
 
   return success;
 }