| Index: chrome/browser/search_engines/template_url_parser.cc
|
| diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
|
| index 44a654f1ebbc647bd2c73d2ce39e55977d43182e..8fa43f528491dd3e6a2e11313c93e3e81e065fdd 100644
|
| --- a/chrome/browser/search_engines/template_url_parser.cc
|
| +++ b/chrome/browser/search_engines/template_url_parser.cc
|
| @@ -21,6 +21,7 @@
|
| #include "libxml/xmlwriter.h"
|
| #include "ui/gfx/favicon_size.h"
|
| #include "url/gurl.h"
|
| +#include "url/url_constants.h"
|
|
|
| namespace {
|
|
|
| @@ -94,8 +95,8 @@ bool IsHTTPRef(const std::string& url) {
|
| if (url.empty())
|
| return true;
|
| GURL gurl(url);
|
| - return gurl.is_valid() && (gurl.SchemeIs(content::kHttpScheme) ||
|
| - gurl.SchemeIs(content::kHttpsScheme));
|
| + return gurl.is_valid() && (gurl.SchemeIs(url::kHttpScheme) ||
|
| + gurl.SchemeIs(url::kHttpsScheme));
|
| }
|
|
|
| } // namespace
|
| @@ -252,8 +253,8 @@ void TemplateURLParsingContext::EndElementImpl(void* ctx, const xmlChar* name) {
|
| // favicon from the URL.
|
| context->derive_image_from_url_ = true;
|
| } else if (context->image_is_valid_for_favicon_ && image_url.is_valid() &&
|
| - (image_url.SchemeIs(content::kHttpScheme) ||
|
| - image_url.SchemeIs(content::kHttpsScheme))) {
|
| + (image_url.SchemeIs(url::kHttpScheme) ||
|
| + image_url.SchemeIs(url::kHttpsScheme))) {
|
| context->data_.favicon_url = image_url;
|
| }
|
| context->image_is_valid_for_favicon_ = false;
|
|
|