| Index: chrome/common/content_settings_helper.cc
|
| diff --git a/chrome/common/content_settings_helper.cc b/chrome/common/content_settings_helper.cc
|
| index 18997c7ae704bfbf5bc1ea95c1dc30672de6547d..c98ed3fd27c5a035f9be0b4aaa32232e52309286 100644
|
| --- a/chrome/common/content_settings_helper.cc
|
| +++ b/chrome/common/content_settings_helper.cc
|
| @@ -1,11 +1,11 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| #include "chrome/common/content_settings_helper.h"
|
|
|
| -#include "base/utf_string_conversions.h"
|
| #include "base/string_piece.h"
|
| +#include "base/utf_string_conversions.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "googleurl/src/gurl.h"
|
|
|
| @@ -15,7 +15,7 @@ std::string OriginToString(const GURL& origin) {
|
| std::string port_component(origin.IntPort() != url_parse::PORT_UNSPECIFIED ?
|
| ":" + origin.port() : "");
|
| std::string scheme_component(!origin.SchemeIs(chrome::kHttpScheme) ?
|
| - origin.scheme() + chrome::kStandardSchemeSeparator : "");
|
| + origin.scheme() + content::kStandardSchemeSeparator : "");
|
| return scheme_component + origin.host() + port_component;
|
| }
|
|
|
|
|