Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Unified Diff: trunk/src/chrome/browser/internal_auth.cc

Issue 198163004: Revert 257524 "Move IsStringASCII/UTF8 to base namespace." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/internal_auth.cc
===================================================================
--- trunk/src/chrome/browser/internal_auth.cc (revision 257532)
+++ trunk/src/chrome/browser/internal_auth.cc (working copy)
@@ -89,7 +89,7 @@
bool IsDomainSane(const std::string& domain) {
return !domain.empty() &&
domain.size() <= kStringLengthLimit &&
- base::IsStringUTF8(domain) &&
+ IsStringUTF8(domain) &&
domain.find_first_of(kItemSeparator) == std::string::npos;
}
@@ -109,14 +109,14 @@
kVarValueSeparator) == kAllowedChars + arraysize(kAllowedChars));
return !var.empty() &&
var.size() <= kStringLengthLimit &&
- base::IsStringASCII(var) &&
+ IsStringASCII(var) &&
var.find_first_not_of(kAllowedChars) == std::string::npos &&
!IsAsciiDigit(var[0]);
}
bool IsValueSane(const std::string& value) {
return value.size() <= kStringLengthLimit &&
- base::IsStringUTF8(value) &&
+ IsStringUTF8(value) &&
value.find_first_of(kItemSeparator) == std::string::npos;
}
@@ -265,7 +265,7 @@
const std::string& domain,
int64 current_tick) {
if (passport.size() != kPassportSize ||
- !base::IsStringASCII(passport) ||
+ !IsStringASCII(passport) ||
!IsDomainSane(domain) ||
current_tick <= dark_tick_ ||
current_tick > key_change_tick_ + kKeyRegenerationHardTicks ||

Powered by Google App Engine
This is Rietveld 408576698