| Index: chrome/common/content_settings_helper.cc
|
| diff --git a/chrome/common/content_settings_helper.cc b/chrome/common/content_settings_helper.cc
|
| index 9fa5607ccf48aa92275add992e47aebe79fdfabe..38840e1b9b56e0815b1947718c9d606f5c1abc3f 100644
|
| --- a/chrome/common/content_settings_helper.cc
|
| +++ b/chrome/common/content_settings_helper.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/strings/string_piece.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/common/url_constants.h"
|
| +#include "net/base/url_constants.h"
|
| #include "url/gurl.h"
|
|
|
| namespace content_settings_helper {
|
| @@ -15,9 +16,9 @@ std::string OriginToString(const GURL& origin) {
|
| std::string port_component(origin.IntPort() != url_parse::PORT_UNSPECIFIED
|
| ? ":" + origin.port()
|
| : std::string());
|
| - std::string scheme_component(!origin.SchemeIs(content::kHttpScheme)
|
| + std::string scheme_component(!origin.SchemeIs(net::kHttpScheme)
|
| ? origin.scheme() +
|
| - content::kStandardSchemeSeparator
|
| + content::kStandardSchemeSeparator
|
| : std::string());
|
| return scheme_component + origin.host() + port_component;
|
| }
|
|
|