Index: extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc |
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc |
index 430a05c1bf195207c2ffee64091a66d641725c2c..615090a8aca64bb9f7ae2d1a8d6c383ba3b65fd5 100644 |
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc |
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc |
@@ -330,7 +330,7 @@ |
const std::string data_; |
const MatchType type_; |
- const base::CompareCase case_sensitive_; |
+ const bool case_sensitive_; |
DISALLOW_COPY_AND_ASSIGN(StringMatchTest); |
}; |
@@ -422,14 +422,14 @@ |
const std::string& str) const { |
switch (type_) { |
case kPrefix: |
- return base::StartsWith(str, data_, case_sensitive_); |
+ return base::StartsWithASCII(str, data_, case_sensitive_); |
case kSuffix: |
return base::EndsWith(str, data_, case_sensitive_); |
case kEquals: |
return str.size() == data_.size() && |
- base::StartsWith(str, data_, case_sensitive_); |
+ base::StartsWithASCII(str, data_, case_sensitive_); |
case kContains: |
- if (case_sensitive_ == base::CompareCase::INSENSITIVE_ASCII) { |
+ if (!case_sensitive_) { |
return std::search(str.begin(), str.end(), data_.begin(), data_.end(), |
CaseInsensitiveCompareASCII<char>()) != str.end(); |
} else { |
@@ -446,8 +446,7 @@ |
bool case_sensitive) |
: data_(data), |
type_(type), |
- case_sensitive_(case_sensitive ? base::CompareCase::SENSITIVE |
- : base::CompareCase::INSENSITIVE_ASCII) {} |
+ case_sensitive_(case_sensitive) {} |
// HeaderMatcher::HeaderMatchTest implementation. |