2 files changed, 5 insertions, 4 deletions
diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc
index b3641eb..a1e3ff3 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.cc
+++ b/google_apis/gaia/oauth2_mint_token_flow.cc
@@ -258,7 +258,7 @@ bool OAuth2MintTokenFlow::ParseIssueAdviceResponse(
   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)) {
@@ -267,7 +267,8 @@ bool OAuth2MintTokenFlow::ParseIssueAdviceResponse(
     }
 
     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]);
diff --git a/google_apis/gaia/oauth2_mint_token_flow.h b/google_apis/gaia/oauth2_mint_token_flow.h
index 5bb751d..06c823c 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.h
+++ b/google_apis/gaia/oauth2_mint_token_flow.h
@@ -43,8 +43,8 @@ struct IssueAdviceInfoEntry {
   IssueAdviceInfoEntry();
   ~IssueAdviceInfoEntry();
 
-  string16 description;
-  std::vector<string16> details;
+  base::string16 description;
+  std::vector<base::string16> details;
 
   bool operator==(const IssueAdviceInfoEntry& rhs) const;
 };