| Index: chrome/common/content_settings_helper.h
|
| diff --git a/chrome/common/content_settings_helper.h b/chrome/common/content_settings_helper.h
|
| index 3662afc7db4fb0663238e25e92a86fc07c2f10ba..8c017c8540c1a8a90168fb2dad898735496d1d70 100644
|
| --- a/chrome/common/content_settings_helper.h
|
| +++ b/chrome/common/content_settings_helper.h
|
| @@ -16,7 +16,7 @@ namespace content_settings_helper {
|
| // Return simplified string representing origin. If origin is using http or
|
| // the standard port, those parts are not included in the output.
|
| std::string OriginToString(const GURL& origin);
|
| -string16 OriginToString16(const GURL& origin);
|
| +base::string16 OriginToString16(const GURL& origin);
|
|
|
| } // namespace content_settings_helper
|
|
|
|
|