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

Unified Diff: trunk/src/chrome/browser/profile_resetter/jtl_interpreter.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/profile_resetter/jtl_interpreter.cc
===================================================================
--- trunk/src/chrome/browser/profile_resetter/jtl_interpreter.cc (revision 257532)
+++ trunk/src/chrome/browser/profile_resetter/jtl_interpreter.cc (working copy)
@@ -195,7 +195,7 @@
StoreValue(const std::string& hashed_name, scoped_ptr<base::Value> value)
: hashed_name_(hashed_name),
value_(value.Pass()) {
- DCHECK(base::IsStringUTF8(hashed_name));
+ DCHECK(IsStringUTF8(hashed_name));
DCHECK(value_);
}
virtual ~StoreValue() {}
@@ -218,7 +218,7 @@
: hashed_name_(hashed_name),
value_(value.Pass()),
default_value_(default_value.Pass()) {
- DCHECK(base::IsStringUTF8(hashed_name));
+ DCHECK(IsStringUTF8(hashed_name));
DCHECK(value_);
DCHECK(default_value_);
}
@@ -244,7 +244,7 @@
public:
explicit StoreNodeValue(const std::string& hashed_name)
: hashed_name_(hashed_name) {
- DCHECK(base::IsStringUTF8(hashed_name));
+ DCHECK(IsStringUTF8(hashed_name));
}
virtual ~StoreNodeValue() {}
virtual bool Execute(ExecutionContext* context) OVERRIDE {
@@ -275,7 +275,7 @@
public:
explicit StoreNodeRegisterableDomain(const std::string& hashed_name)
: hashed_name_(hashed_name) {
- DCHECK(base::IsStringUTF8(hashed_name));
+ DCHECK(IsStringUTF8(hashed_name));
}
virtual ~StoreNodeRegisterableDomain() {}
virtual bool Execute(ExecutionContext* context) OVERRIDE {
@@ -488,7 +488,7 @@
break;
case jtl_foundation::STORE_BOOL: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
bool value = false;
if (!ReadBool(&value))
@@ -500,7 +500,7 @@
}
case jtl_foundation::COMPARE_STORED_BOOL: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
bool value = false;
if (!ReadBool(&value))
@@ -517,7 +517,7 @@
}
case jtl_foundation::STORE_HASH: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
std::string hashed_value;
if (!ReadHash(&hashed_value))
@@ -529,7 +529,7 @@
}
case jtl_foundation::COMPARE_STORED_HASH: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
std::string hashed_value;
if (!ReadHash(&hashed_value))
@@ -546,21 +546,21 @@
}
case jtl_foundation::STORE_NODE_BOOL: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
operators.push_back(new StoreNodeValue<true>(hashed_name));
break;
}
case jtl_foundation::STORE_NODE_HASH: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
operators.push_back(new StoreNodeValue<false>(hashed_name));
break;
}
case jtl_foundation::STORE_NODE_REGISTERABLE_DOMAIN_HASH: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
operators.push_back(new StoreNodeRegisterableDomain(hashed_name));
break;
@@ -588,14 +588,14 @@
}
case jtl_foundation::COMPARE_NODE_TO_STORED_BOOL: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
operators.push_back(new CompareNodeToStored<true>(hashed_name));
break;
}
case jtl_foundation::COMPARE_NODE_TO_STORED_HASH: {
std::string hashed_name;
- if (!ReadHash(&hashed_name) || !base::IsStringUTF8(hashed_name))
+ if (!ReadHash(&hashed_name) || !IsStringUTF8(hashed_name))
return false;
operators.push_back(new CompareNodeToStored<false>(hashed_name));
break;

Powered by Google App Engine
This is Rietveld 408576698