| Index: chrome/browser/internal_auth.cc
|
| diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc
|
| index 984c95477139b59af208050f1cb040f329945e4d..acdd4420b22eb839b27e1090a584f08761d03f72 100644
|
| --- a/chrome/browser/internal_auth.cc
|
| +++ b/chrome/browser/internal_auth.cc
|
| @@ -89,7 +89,7 @@ int64 GetCurrentTick() {
|
| bool IsDomainSane(const std::string& domain) {
|
| return !domain.empty() &&
|
| domain.size() <= kStringLengthLimit &&
|
| - IsStringUTF8(domain) &&
|
| + base::IsStringUTF8(domain) &&
|
| domain.find_first_of(kItemSeparator) == std::string::npos;
|
| }
|
|
|
| @@ -109,14 +109,14 @@ bool IsVarSane(const std::string& var) {
|
| kVarValueSeparator) == kAllowedChars + arraysize(kAllowedChars));
|
| return !var.empty() &&
|
| var.size() <= kStringLengthLimit &&
|
| - IsStringASCII(var) &&
|
| + base::IsStringASCII(var) &&
|
| var.find_first_not_of(kAllowedChars) == std::string::npos &&
|
| !IsAsciiDigit(var[0]);
|
| }
|
|
|
| bool IsValueSane(const std::string& value) {
|
| return value.size() <= kStringLengthLimit &&
|
| - IsStringUTF8(value) &&
|
| + base::IsStringUTF8(value) &&
|
| value.find_first_of(kItemSeparator) == std::string::npos;
|
| }
|
|
|
| @@ -265,7 +265,7 @@ class InternalAuthVerificationService {
|
| const std::string& domain,
|
| int64 current_tick) {
|
| if (passport.size() != kPassportSize ||
|
| - !IsStringASCII(passport) ||
|
| + !base::IsStringASCII(passport) ||
|
| !IsDomainSane(domain) ||
|
| current_tick <= dark_tick_ ||
|
| current_tick > key_change_tick_ + kKeyRegenerationHardTicks ||
|
|
|