Index: chrome/browser/extensions/api/web_request/web_request_api_helpers.cc |
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc |
index a9f131963507bd21de50184296c7c797a347176d..0d2a3d66f7513dc0ef2825518759288423438190 100644 |
--- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc |
+++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc |
@@ -621,7 +621,7 @@ static std::string FindSetRequestHeader( |
return (*delta)->extension_id; |
} |
} |
- return ""; |
+ return std::string(); |
} |
// Returns the extension ID of the first extension in |deltas| that removes the |
@@ -639,7 +639,7 @@ static std::string FindRemoveRequestHeader( |
return (*delta)->extension_id; |
} |
} |
- return ""; |
+ return std::string(); |
} |
void MergeOnBeforeSendHeadersResponses( |
@@ -816,22 +816,26 @@ static bool DoesResponseCookieMatchFilter(net::ParsedCookie* cookie, |
if (filter->name.get() && cookie->Name() != *filter->name) return false; |
if (filter->value.get() && cookie->Value() != *filter->value) return false; |
if (filter->expires.get()) { |
- std::string actual_value = cookie->HasExpires() ? cookie->Expires() : ""; |
+ std::string actual_value = |
+ cookie->HasExpires() ? cookie->Expires() : std::string(); |
if (actual_value != *filter->expires) |
return false; |
} |
if (filter->max_age.get()) { |
- std::string actual_value = cookie->HasMaxAge() ? cookie->MaxAge() : ""; |
+ std::string actual_value = |
+ cookie->HasMaxAge() ? cookie->MaxAge() : std::string(); |
if (actual_value != base::IntToString(*filter->max_age)) |
return false; |
} |
if (filter->domain.get()) { |
- std::string actual_value = cookie->HasDomain() ? cookie->Domain() : ""; |
+ std::string actual_value = |
+ cookie->HasDomain() ? cookie->Domain() : std::string(); |
if (actual_value != *filter->domain) |
return false; |
} |
if (filter->path.get()) { |
- std::string actual_value = cookie->HasPath() ? cookie->Path() : ""; |
+ std::string actual_value = |
+ cookie->HasPath() ? cookie->Path() : std::string(); |
if (actual_value != *filter->path) |
return false; |
} |
@@ -880,7 +884,8 @@ static bool MergeAddResponseCookieModifications( |
continue; |
// Cookie names are not unique in response cookies so we always append |
// and never override. |
- linked_ptr<net::ParsedCookie> cookie(new net::ParsedCookie("")); |
+ linked_ptr<net::ParsedCookie> cookie( |
+ new net::ParsedCookie(std::string())); |
ApplyResponseCookieModification((*mod)->modification.get(), cookie.get()); |
cookies->push_back(cookie); |
modified = true; |
@@ -1008,7 +1013,7 @@ static std::string FindRemoveResponseHeader( |
return (*delta)->extension_id; |
} |
} |
- return ""; |
+ return std::string(); |
} |
void MergeOnHeadersReceivedResponses( |