diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
| commit | ad65a3ee540552ecca50ebbf9382f1a4c718d383 (patch) | |
| tree | 68082d6d78331413eba2f799547026940c07e004 /google_apis/gaia | |
| parent | 750f4497a3b87a4a028d4d6ce3ce88e01314139c (diff) | |
| download | chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.zip chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.gz chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.bz2 | |
Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media/, net/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/112963005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/gaia')
| -rw-r--r-- | google_apis/gaia/oauth2_mint_token_flow.cc | 2 | ||||
| -rw-r--r-- | google_apis/gaia/oauth2_mint_token_flow_unittest.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc index 94cacde..437574d 100644 --- a/google_apis/gaia/oauth2_mint_token_flow.cc +++ b/google_apis/gaia/oauth2_mint_token_flow.cc @@ -268,7 +268,7 @@ bool OAuth2MintTokenFlow::ParseIssueAdviceResponse( TrimWhitespace(entry.description, TRIM_ALL, &entry.description); static const base::string16 detail_separators = - ASCIIToUTF16(kDetailSeparators); + base::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_unittest.cc b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc index 8632f56..8fd359f 100644 --- a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc +++ b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc @@ -111,13 +111,13 @@ std::vector<std::string> CreateTestScopes() { static IssueAdviceInfo CreateIssueAdvice() { IssueAdviceInfo ia; IssueAdviceInfoEntry e1; - e1.description = ASCIIToUTF16("Manage your calendars"); - e1.details.push_back(ASCIIToUTF16("View and manage your calendars")); + e1.description = base::ASCIIToUTF16("Manage your calendars"); + e1.details.push_back(base::ASCIIToUTF16("View and manage your calendars")); ia.push_back(e1); IssueAdviceInfoEntry e2; - e2.description = ASCIIToUTF16("Manage your documents"); - e2.details.push_back(ASCIIToUTF16("View your documents")); - e2.details.push_back(ASCIIToUTF16("Upload new documents")); + e2.description = base::ASCIIToUTF16("Manage your documents"); + e2.details.push_back(base::ASCIIToUTF16("View your documents")); + e2.details.push_back(base::ASCIIToUTF16("Upload new documents")); ia.push_back(e2); return ia; } |