Commit 8e2806b1 authored by Jinho Bang's avatar Jinho Bang Committed by Commit Bot

Jumbo: Fix a build error in components/content_settings

The build error occurs if using `use_jumbo_build=true` in GN
configuration. The same variable name is used in the anonymous namespace
of content_settings_registry.cc and website_settings_registry.cc. It can
cause a name conflict during merging both files.

TBR=raymes@chromium.org
NOTRY=true

Bug: none
Change-Id: I33eeb5ff00a2ab113d28a63f0044442375b98df2
Reviewed-on: https://chromium-review.googlesource.com/1212422
Commit-Queue: Jinho Bang <jinho.bang@samsung.com>
Reviewed-by: default avatarJinho Bang <jinho.bang@samsung.com>
Cr-Commit-Position: refs/heads/master@{#589400}
parent 3e7cdbb5
...@@ -21,8 +21,8 @@ namespace content_settings { ...@@ -21,8 +21,8 @@ namespace content_settings {
namespace { namespace {
base::LazyInstance<ContentSettingsRegistry>::DestructorAtExit g_instance = base::LazyInstance<ContentSettingsRegistry>::DestructorAtExit
LAZY_INSTANCE_INITIALIZER; g_content_settings_registry_instance = LAZY_INSTANCE_INITIALIZER;
// TODO(raymes): These overloaded functions make the registration code clearer. // TODO(raymes): These overloaded functions make the registration code clearer.
// When initializer lists are available they won't be needed. The initializer // When initializer lists are available they won't be needed. The initializer
...@@ -73,7 +73,7 @@ std::set<ContentSetting> ValidSettings(ContentSetting setting1, ...@@ -73,7 +73,7 @@ std::set<ContentSetting> ValidSettings(ContentSetting setting1,
// static // static
ContentSettingsRegistry* ContentSettingsRegistry::GetInstance() { ContentSettingsRegistry* ContentSettingsRegistry::GetInstance() {
return g_instance.Pointer(); return g_content_settings_registry_instance.Pointer();
} }
ContentSettingsRegistry::ContentSettingsRegistry() ContentSettingsRegistry::ContentSettingsRegistry()
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
namespace { namespace {
base::LazyInstance<content_settings::WebsiteSettingsRegistry>::DestructorAtExit base::LazyInstance<content_settings::WebsiteSettingsRegistry>::DestructorAtExit
g_instance = LAZY_INSTANCE_INITIALIZER; g_website_settings_registry_instance = LAZY_INSTANCE_INITIALIZER;
} // namespace } // namespace
...@@ -23,7 +23,7 @@ namespace content_settings { ...@@ -23,7 +23,7 @@ namespace content_settings {
// static // static
WebsiteSettingsRegistry* WebsiteSettingsRegistry::GetInstance() { WebsiteSettingsRegistry* WebsiteSettingsRegistry::GetInstance() {
return g_instance.Pointer(); return g_website_settings_registry_instance.Pointer();
} }
WebsiteSettingsRegistry::WebsiteSettingsRegistry() { WebsiteSettingsRegistry::WebsiteSettingsRegistry() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment