| Index: chrome/browser/policy/browser_policy_connector.cc
|
| ===================================================================
|
| --- chrome/browser/policy/browser_policy_connector.cc (revision 184354)
|
| +++ chrome/browser/policy/browser_policy_connector.cc (working copy)
|
| @@ -403,7 +403,7 @@
|
| const string16 domain =
|
| UTF8ToUTF16(gaia::ExtractDomainName(gaia::CanonicalizeEmail(username)));
|
| for (size_t i = 0; i < arraysize(kNonManagedDomainPatterns); i++) {
|
| - string16 pattern = base::WideToUTF16(kNonManagedDomainPatterns[i]);
|
| + string16 pattern = WideToUTF16(kNonManagedDomainPatterns[i]);
|
| if (MatchDomain(domain, pattern))
|
| return true;
|
| }
|
|
|
| Property changes on: chrome/browser/policy/browser_policy_connector.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|