| Index: chrome/browser/signin/signin_manager.cc
|
| diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
|
| index 72e446c389ff40321df0abcc95603c3fe3ac48aa..d3dc64e0e8bcb22a84b63ccfb502150f5e7581e5 100644
|
| --- a/chrome/browser/signin/signin_manager.cc
|
| +++ b/chrome/browser/signin/signin_manager.cc
|
| @@ -407,7 +407,7 @@ bool SigninManager::IsUsernameAllowedByPolicy(const std::string& username,
|
| // are not valid regular expressions - they should instead be ".*@foo.com").
|
| // For convenience, detect these patterns and insert a "." character at the
|
| // front.
|
| - base::string16 pattern = UTF8ToUTF16(policy);
|
| + base::string16 pattern = base::UTF8ToUTF16(policy);
|
| if (pattern[0] == L'*')
|
| pattern.insert(pattern.begin(), L'.');
|
|
|
| @@ -421,7 +421,7 @@ bool SigninManager::IsUsernameAllowedByPolicy(const std::string& username,
|
| // break signin than to quietly allow users to sign in).
|
| return false;
|
| }
|
| - base::string16 username16 = UTF8ToUTF16(username);
|
| + base::string16 username16 = base::UTF8ToUTF16(username);
|
| icu::UnicodeString icu_input(username16.data(), username16.length());
|
| matcher.reset(icu_input);
|
| status = U_ZERO_ERROR;
|
|
|