| 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..3550070c85f9611a78e4f8ed34b498d819b665a9 100644
|
| --- a/chrome/browser/search_engines/template_url_parser.cc
|
| +++ b/chrome/browser/search_engines/template_url_parser.cc
|
| @@ -19,6 +19,7 @@
|
| #include "chrome/common/url_constants.h"
|
| #include "libxml/parser.h"
|
| #include "libxml/xmlwriter.h"
|
| +#include "net/base/url_constants.h"
|
| #include "ui/gfx/favicon_size.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -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(net::kHttpScheme) || gurl.SchemeIs(net::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(net::kHttpScheme) ||
|
| + image_url.SchemeIs(net::kHttpsScheme))) {
|
| context->data_.favicon_url = image_url;
|
| }
|
| context->image_is_valid_for_favicon_ = false;
|
|
|