diff options
Diffstat (limited to 'chrome')
56 files changed, 97 insertions, 94 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index b2c55a6..618b894 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -97,13 +97,13 @@ #endif base::LazyInstance<chrome::ChromeContentBrowserClient> - g_chrome_content_browser_client(base::LINKER_INITIALIZED); + g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; base::LazyInstance<chrome::ChromeContentRendererClient> - g_chrome_content_renderer_client(base::LINKER_INITIALIZED); + g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; base::LazyInstance<chrome::ChromeContentUtilityClient> - g_chrome_content_utility_client(base::LINKER_INITIALIZED); + g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; base::LazyInstance<chrome::ChromeContentPluginClient> - g_chrome_content_plugin_client(base::LINKER_INITIALIZED); + g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; extern int NaClMain(const content::MainFunctionParams&); extern int ServiceProcessMain(const content::MainFunctionParams&); diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc index ec5ae69..79d98d3 100644 --- a/chrome/browser/automation/automation_resource_message_filter.cc +++ b/chrome/browser/automation/automation_resource_message_filter.cc @@ -24,12 +24,12 @@ using content::BrowserThread; base::LazyInstance<AutomationResourceMessageFilter::RenderViewMap> - AutomationResourceMessageFilter::filtered_render_views_( - base::LINKER_INITIALIZED); + AutomationResourceMessageFilter::filtered_render_views_ = + LAZY_INSTANCE_INITIALIZER; base::LazyInstance<AutomationResourceMessageFilter::CompletionCallbackMap> - AutomationResourceMessageFilter::completion_callback_map_( - base::LINKER_INITIALIZED); + AutomationResourceMessageFilter::completion_callback_map_ = + LAZY_INSTANCE_INITIALIZER; int AutomationResourceMessageFilter::unique_request_id_ = 1; int AutomationResourceMessageFilter::next_completion_callback_id_ = 0; diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index a4cbf7b..6a27400c 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -101,8 +101,8 @@ static const FilePath::CharType kLoginTimes[] = FPL("login-times"); // Name of file collecting logout times. static const char kLogoutTimes[] = "logout-times"; -static base::LazyInstance<BootTimesLoader> g_boot_times_loader( - base::LINKER_INITIALIZED); +static base::LazyInstance<BootTimesLoader> g_boot_times_loader = + LAZY_INSTANCE_INITIALIZER; BootTimesLoader::BootTimesLoader() : backend_(new Backend()), diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 2e676f4..cb66831 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -72,8 +72,8 @@ class MessageLoopObserver : public MessageLoopForUI::Observer { #endif }; -static base::LazyInstance<MessageLoopObserver> g_message_loop_observer( - base::LINKER_INITIALIZED); +static base::LazyInstance<MessageLoopObserver> g_message_loop_observer = + LAZY_INSTANCE_INITIALIZER; ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos( const content::MainFunctionParams& parameters) diff --git a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc index 25e9df8..24e656b 100644 --- a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc +++ b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc @@ -87,8 +87,8 @@ class OncNetworkParserTest : public testing::Test { }; // static -base::LazyInstance<ScopedTempDir> OncNetworkParserTest::temp_db_dir_( - base::LINKER_INITIALIZED); +base::LazyInstance<ScopedTempDir> OncNetworkParserTest::temp_db_dir_ = + LAZY_INSTANCE_INITIALIZER; TEST_F(OncNetworkParserTest, TestCreateNetworkWifi1) { std::string test_blob( diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc index 3afc168..9bbb4f9 100644 --- a/chrome/browser/chromeos/cros_settings.cc +++ b/chrome/browser/chromeos/cros_settings.cc @@ -17,8 +17,8 @@ namespace chromeos { -static base::LazyInstance<CrosSettings> g_cros_settings( - base::LINKER_INITIALIZED); +static base::LazyInstance<CrosSettings> g_cros_settings = + LAZY_INSTANCE_INITIALIZER; CrosSettings* CrosSettings::Get() { // TODO(xiyaun): Use real stuff when underlying libcros is ready. diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.cc b/chrome/browser/chromeos/extensions/input_method_event_router.cc index 443128c..18a06f6 100644 --- a/chrome/browser/chromeos/extensions/input_method_event_router.cc +++ b/chrome/browser/chromeos/extensions/input_method_event_router.cc @@ -42,7 +42,7 @@ class InputMethodPrivateExtensionsWhitelist { }; base::LazyInstance<InputMethodPrivateExtensionsWhitelist> - g_input_method_private_extensions_whitelist(base::LINKER_INITIALIZED); + g_input_method_private_extensions_whitelist = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/chromeos/login/ownership_service.cc b/chrome/browser/chromeos/login/ownership_service.cc index 539aa62..ffdcf57 100644 --- a/chrome/browser/chromeos/login/ownership_service.cc +++ b/chrome/browser/chromeos/login/ownership_service.cc @@ -19,8 +19,8 @@ using content::BrowserThread; namespace chromeos { -static base::LazyInstance<OwnershipService> g_ownership_service( - base::LINKER_INITIALIZED); +static base::LazyInstance<OwnershipService> g_ownership_service = + LAZY_INSTANCE_INITIALIZER; // static OwnershipService* OwnershipService::GetSharedInstance() { diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index b9e92fa..5a68498 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -175,8 +175,8 @@ class ScreenLockObserver : public chromeos::ScreenLockLibrary::Observer, DISALLOW_COPY_AND_ASSIGN(ScreenLockObserver); }; -static base::LazyInstance<ScreenLockObserver> g_screen_lock_observer( - base::LINKER_INITIALIZED); +static base::LazyInstance<ScreenLockObserver> g_screen_lock_observer = + LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/chromeos/login/signed_settings_helper.cc b/chrome/browser/chromeos/login/signed_settings_helper.cc index 0841b40..2c2309d 100644 --- a/chrome/browser/chromeos/login/signed_settings_helper.cc +++ b/chrome/browser/chromeos/login/signed_settings_helper.cc @@ -331,7 +331,7 @@ class SignedSettingsHelperImpl : public SignedSettingsHelper, }; static base::LazyInstance<SignedSettingsHelperImpl> - g_signed_settings_helper_impl(base::LINKER_INITIALIZED); + g_signed_settings_helper_impl = LAZY_INSTANCE_INITIALIZER; SignedSettingsHelperImpl::SignedSettingsHelperImpl() { } diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index b1d3927..d4d598f 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -83,7 +83,7 @@ const int kStubDefaultImageIndex = 0; // Delay betweeen user login and attempt to update user's profile image. const long kProfileImageDownloadDelayMs = 10000; -base::LazyInstance<UserManager> g_user_manager(base::LINKER_INITIALIZED); +base::LazyInstance<UserManager> g_user_manager = LAZY_INSTANCE_INITIALIZER; // Used to handle the asynchronous response of deleting a cryptohome directory. class RemoveAttempt : public CryptohomeLibrary::Delegate { diff --git a/chrome/browser/chromeos/system/udev_info_provider.cc b/chrome/browser/chromeos/system/udev_info_provider.cc index c2f9362b..92a30a7 100644 --- a/chrome/browser/chromeos/system/udev_info_provider.cc +++ b/chrome/browser/chromeos/system/udev_info_provider.cc @@ -44,8 +44,8 @@ class UdevInfoProviderImpl : public UdevInfoProvider { DISALLOW_COPY_AND_ASSIGN(UdevInfoProviderImpl); }; -base::LazyInstance<UdevInfoProviderImpl> g_udev_info_provider( - base::LINKER_INITIALIZED); +base::LazyInstance<UdevInfoProviderImpl> g_udev_info_provider = + LAZY_INSTANCE_INITIALIZER; bool UdevInfoProviderImpl::QueryDeviceProperty(const std::string& sys_path, const std::string& property_name, diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc index 9a494e3..c431b7f 100644 --- a/chrome/browser/chromeos/web_socket_proxy_controller.cc +++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc @@ -96,7 +96,7 @@ class OriginValidator { std::vector<std::string> allowed_origins_; }; -base::LazyInstance<OriginValidator> g_validator(base::LINKER_INITIALIZED); +base::LazyInstance<OriginValidator> g_validator = LAZY_INSTANCE_INITIALIZER; class ProxyTask : public Task { virtual void Run() OVERRIDE; @@ -154,7 +154,7 @@ class ProxyLifetime friend class chromeos::WebSocketProxyController; }; -base::LazyInstance<ProxyLifetime> g_proxy_lifetime(base::LINKER_INITIALIZED); +base::LazyInstance<ProxyLifetime> g_proxy_lifetime = LAZY_INSTANCE_INITIALIZER; void ProxyTask::Run() { LOG(INFO) << "Attempt to run web socket proxy task"; diff --git a/chrome/browser/chromeos/wm_ipc.cc b/chrome/browser/chromeos/wm_ipc.cc index f77f21c..0f71a642 100644 --- a/chrome/browser/chromeos/wm_ipc.cc +++ b/chrome/browser/chromeos/wm_ipc.cc @@ -74,7 +74,7 @@ bool SetIntArrayProperty(XID xid, } // namespace -static base::LazyInstance<WmIpc> g_wm_ipc(base::LINKER_INITIALIZED); +static base::LazyInstance<WmIpc> g_wm_ipc = LAZY_INSTANCE_INITIALIZER; // static WmIpc* WmIpc::instance() { diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index 2aa6dff..09735ce 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -34,8 +34,8 @@ using content::BrowserThread; namespace { typedef std::list<TabSpecificContentSettings*> TabSpecificList; -static base::LazyInstance<TabSpecificList> g_tab_specific( - base::LINKER_INITIALIZED); +static base::LazyInstance<TabSpecificList> g_tab_specific = + LAZY_INSTANCE_INITIALIZER; } bool TabSpecificContentSettings::LocalSharedObjectsContainer::empty() const { diff --git a/chrome/browser/debugger/devtools_file_util.cc b/chrome/browser/debugger/devtools_file_util.cc index 4f6b1db1..7e4158a 100644 --- a/chrome/browser/debugger/devtools_file_util.cc +++ b/chrome/browser/debugger/devtools_file_util.cc @@ -19,7 +19,7 @@ namespace { base::LazyInstance<FilePath, base::LeakyLazyInstanceTraits<FilePath> > - g_last_save_path(base::LINKER_INITIALIZED); + g_last_save_path = LAZY_INSTANCE_INITIALIZER; class SaveAsDialog : public SelectFileDialog::Listener, public base::RefCounted<SaveAsDialog> { diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 21a85cc..e563960 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -109,7 +109,7 @@ class DefaultDownloadDirectory { }; static base::LazyInstance<DefaultDownloadDirectory> - g_default_download_directory(base::LINKER_INITIALIZED); + g_default_download_directory = LAZY_INSTANCE_INITIALIZER; const FilePath& GetDefaultDownloadDirectory() { return g_default_download_directory.Get().path(); diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index c650daa..934bfd7 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -53,7 +53,7 @@ struct Whitelist { }; static base::LazyInstance<Whitelist> - g_whitelisted_install_data(base::LINKER_INITIALIZED); + g_whitelisted_install_data = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/extensions/extension_omnibox_api.cc b/chrome/browser/extensions/extension_omnibox_api.cc index 1590927b..300333e 100644 --- a/chrome/browser/extensions/extension_omnibox_api.cc +++ b/chrome/browser/extensions/extension_omnibox_api.cc @@ -41,7 +41,8 @@ const char kDescriptionStylesOffset[] = "offset"; const char kDescriptionStylesLength[] = "length"; static base::LazyInstance<PropertyAccessor<ExtensionOmniboxSuggestion> > - g_extension_omnibox_suggestion_property_accessor(base::LINKER_INITIALIZED); + g_extension_omnibox_suggestion_property_accessor = + LAZY_INSTANCE_INITIALIZER; PropertyAccessor<ExtensionOmniboxSuggestion>& GetPropertyAccessor() { return g_extension_omnibox_suggestion_property_accessor.Get(); diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index 0cc2d01..d80b898 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -29,8 +29,8 @@ namespace { typedef std::map<TabContents*, ExtensionWebNavigationTabObserver*> TabObserverMap; -static base::LazyInstance<TabObserverMap> g_tab_observer( - base::LINKER_INITIALIZED); +static base::LazyInstance<TabObserverMap> g_tab_observer = + LAZY_INSTANCE_INITIALIZER; // URL schemes for which we'll send events. const char* kValidSchemes[] = { diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index f324298..bf504a6 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -121,7 +121,7 @@ class ExternalTabPageInfoBubbleView : public PageInfoBubbleView { }; base::LazyInstance<ExternalTabContainer::PendingTabs> - ExternalTabContainer::pending_tabs_(base::LINKER_INITIALIZED); + ExternalTabContainer::pending_tabs_ = LAZY_INSTANCE_INITIALIZER; ExternalTabContainer::ExternalTabContainer( AutomationProvider* automation, AutomationResourceMessageFilter* filter) diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc index 0730661..cd7216e 100644 --- a/chrome/browser/internal_auth.cc +++ b/chrome/browser/internal_auth.cc @@ -325,10 +325,10 @@ class InternalAuthVerificationService { namespace { static base::LazyInstance<browser::InternalAuthVerificationService> - g_verification_service(base::LINKER_INITIALIZED); + g_verification_service = LAZY_INSTANCE_INITIALIZER; static base::LazyInstance<base::Lock, base::LeakyLazyInstanceTraits<base::Lock> > - g_verification_service_lock(base::LINKER_INITIALIZED); + g_verification_service_lock = LAZY_INSTANCE_INITIALIZER; } // namespace @@ -433,7 +433,7 @@ class InternalAuthGenerationService : public base::ThreadChecker { namespace { static base::LazyInstance<browser::InternalAuthGenerationService> - g_generation_service(base::LINKER_INITIALIZED); + g_generation_service = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc index f4923f1..576204f 100644 --- a/chrome/browser/plugin_prefs.cc +++ b/chrome/browser/plugin_prefs.cc @@ -41,8 +41,8 @@ namespace { // Default state for a plug-in (not state of the default plug-in!). // Accessed only on the UI thread. -base::LazyInstance<std::map<FilePath, bool> > g_default_plugin_state( - base::LINKER_INITIALIZED); +base::LazyInstance<std::map<FilePath, bool> > g_default_plugin_state = + LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc index 8958dba..ddcf209 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -40,7 +40,7 @@ struct PrintingSequencePathMap { // No locking, only access on the FILE thread. static base::LazyInstance<PrintingSequencePathMap> - g_printing_file_descriptor_map(base::LINKER_INITIALIZED); + g_printing_file_descriptor_map = LAZY_INSTANCE_INITIALIZER; #endif void RenderParamsFromPrintSettings(const printing::PrintSettings& settings, diff --git a/chrome/browser/resources_util.cc b/chrome/browser/resources_util.cc index a11181e..a406b4d 100644 --- a/chrome/browser/resources_util.cc +++ b/chrome/browser/resources_util.cc @@ -41,7 +41,7 @@ class ThemeMap { StringIntMap id_map_; }; -static base::LazyInstance<ThemeMap> g_theme_ids(base::LINKER_INITIALIZED); +static base::LazyInstance<ThemeMap> g_theme_ids = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/safe_browsing/malware_details.cc b/chrome/browser/safe_browsing/malware_details.cc index 2b4a305..9455d90 100644 --- a/chrome/browser/safe_browsing/malware_details.cc +++ b/chrome/browser/safe_browsing/malware_details.cc @@ -54,7 +54,7 @@ class MalwareDetailsFactoryImpl }; static base::LazyInstance<MalwareDetailsFactoryImpl> - g_malware_details_factory_impl(base::LINKER_INITIALIZED); + g_malware_details_factory_impl = LAZY_INSTANCE_INITIALIZER; // Create a MalwareDetails for the given tab. /* static */ diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 7e13c1d..33eedbc 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -102,7 +102,7 @@ static const char* const kBoxChecked = "boxchecked"; SafeBrowsingBlockingPageFactory* SafeBrowsingBlockingPage::factory_ = NULL; static base::LazyInstance<SafeBrowsingBlockingPage::UnsafeResourceMap> - g_unsafe_resource_map(base::LINKER_INITIALIZED); + g_unsafe_resource_map = LAZY_INSTANCE_INITIALIZER; // The default SafeBrowsingBlockingPageFactory. Global, made a singleton so we // don't leak it. @@ -127,7 +127,7 @@ class SafeBrowsingBlockingPageFactoryImpl }; static base::LazyInstance<SafeBrowsingBlockingPageFactoryImpl> - g_safe_browsing_blocking_page_factory_impl(base::LINKER_INITIALIZED); + g_safe_browsing_blocking_page_factory_impl = LAZY_INSTANCE_INITIALIZER; SafeBrowsingBlockingPage::SafeBrowsingBlockingPage( SafeBrowsingService* sb_service, diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 2222296..2374ca4 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -101,7 +101,7 @@ class SafeBrowsingServiceFactoryImpl : public SafeBrowsingServiceFactory { }; static base::LazyInstance<SafeBrowsingServiceFactoryImpl> - g_safe_browsing_service_factory_impl(base::LINKER_INITIALIZED); + g_safe_browsing_service_factory_impl = LAZY_INSTANCE_INITIALIZER; struct SafeBrowsingService::WhiteListedEntry { int render_process_host_id; diff --git a/chrome/browser/speech/speech_input_bubble.cc b/chrome/browser/speech/speech_input_bubble.cc index 668915a..edf4414 100644 --- a/chrome/browser/speech/speech_input_bubble.cc +++ b/chrome/browser/speech/speech_input_bubble.cc @@ -98,7 +98,8 @@ SpeechInputBubbleImages::SpeechInputBubbleImages() { } } -base::LazyInstance<SpeechInputBubbleImages> g_images(base::LINKER_INITIALIZED); +base::LazyInstance<SpeechInputBubbleImages> g_images = + LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/speech/speech_input_extension_notification.cc b/chrome/browser/speech/speech_input_extension_notification.cc index 8dd92a4..6a07a46 100644 --- a/chrome/browser/speech/speech_input_extension_notification.cc +++ b/chrome/browser/speech/speech_input_extension_notification.cc @@ -52,7 +52,7 @@ NotificationTrayImages::NotificationTrayImages() { IDR_SPEECH_INPUT_TRAY_BALLOON_ICON); } -base::LazyInstance<NotificationTrayImages> g_images(base::LINKER_INITIALIZED); +base::LazyInstance<NotificationTrayImages> g_images = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/spellchecker/spellcheck_profile.cc b/chrome/browser/spellchecker/spellcheck_profile.cc index ecb6cb9..9af9a1e 100644 --- a/chrome/browser/spellchecker/spellcheck_profile.cc +++ b/chrome/browser/spellchecker/spellcheck_profile.cc @@ -18,8 +18,8 @@ using content::BrowserThread; namespace { -base::LazyInstance<SpellCheckProfile::CustomWordList> g_empty_list( - base::LINKER_INITIALIZED); +base::LazyInstance<SpellCheckProfile::CustomWordList> g_empty_list = + LAZY_INSTANCE_INITIALIZER; } // namespace SpellCheckProfile::SpellCheckProfile(const FilePath& profile_dir) diff --git a/chrome/browser/sync/util/sqlite_utils.cc b/chrome/browser/sync/util/sqlite_utils.cc index 725fd8d..4cb6c4e 100644 --- a/chrome/browser/sync/util/sqlite_utils.cc +++ b/chrome/browser/sync/util/sqlite_utils.cc @@ -80,7 +80,7 @@ class DefaultSQLErrorHandlerFactory : public SQLErrorHandlerFactory { }; static base::LazyInstance<DefaultSQLErrorHandlerFactory> - g_default_sql_error_handler_factory(base::LINKER_INITIALIZED); + g_default_sql_error_handler_factory = LAZY_INSTANCE_INITIALIZER; SQLErrorHandlerFactory* GetErrorHandlerFactory() { // TODO(cpu): Testing needs to override the error handler. diff --git a/chrome/browser/tabs/pinned_tab_service_factory.cc b/chrome/browser/tabs/pinned_tab_service_factory.cc index 5b2e7ac..70407ad 100644 --- a/chrome/browser/tabs/pinned_tab_service_factory.cc +++ b/chrome/browser/tabs/pinned_tab_service_factory.cc @@ -9,8 +9,8 @@ #include "chrome/browser/profiles/profile_dependency_manager.h" namespace { -base::LazyInstance<PinnedTabServiceFactory> g_pinned_tab_service_factory( - base::LINKER_INITIALIZED); +base::LazyInstance<PinnedTabServiceFactory> g_pinned_tab_service_factory = + LAZY_INSTANCE_INITIALIZER; } // static diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index ac21d38..ad4cbc4 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -141,7 +141,7 @@ const char* const TranslateManager::kTargetLanguagesKey = "tl"; // static base::LazyInstance<std::set<std::string> > - TranslateManager::supported_languages_(base::LINKER_INITIALIZED); + TranslateManager::supported_languages_ = LAZY_INSTANCE_INITIALIZER; TranslateManager::~TranslateManager() { weak_method_factory_.InvalidateWeakPtrs(); diff --git a/chrome/browser/ui/cocoa/view_id_util.mm b/chrome/browser/ui/cocoa/view_id_util.mm index f3396a9..691c7f3 100644 --- a/chrome/browser/ui/cocoa/view_id_util.mm +++ b/chrome/browser/ui/cocoa/view_id_util.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -21,7 +21,7 @@ namespace { // rather than using a separated map. typedef std::map<NSView*, ViewID> ViewIDMap; -static base::LazyInstance<ViewIDMap> g_view_id_map(base::LINKER_INITIALIZED); +static base::LazyInstance<ViewIDMap> g_view_id_map = LAZY_INSTANCE_INITIALIZER; // Returns the view's nearest descendant (including itself) with a specific // ViewID, or nil if no subview has that ViewID. diff --git a/chrome/browser/ui/panels/panel_manager.cc b/chrome/browser/ui/panels/panel_manager.cc index 7dd7155..b856cda 100644 --- a/chrome/browser/ui/panels/panel_manager.cc +++ b/chrome/browser/ui/panels/panel_manager.cc @@ -51,7 +51,7 @@ const int kMillisecondsBeforeCollapsingFromTitleOnlyState = 0; // static PanelManager* PanelManager::GetInstance() { - static base::LazyInstance<PanelManager> instance(base::LINKER_INITIALIZED); + static base::LazyInstance<PanelManager> instance = LAZY_INSTANCE_INITIALIZER; return instance.Pointer(); } diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc index 110f29e..eb0f311 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc @@ -65,7 +65,7 @@ namespace { static base::LazyInstance<PropertyAccessor<TabContentsWrapper*> > - g_tab_contents_wrapper_property_accessor(base::LINKER_INITIALIZED); + g_tab_contents_wrapper_property_accessor = LAZY_INSTANCE_INITIALIZER; // The list of prefs we want to observe. const char* kPrefsToObserve[] = { diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index 1c9b1dd..f05a8f1 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -416,7 +416,7 @@ void PaintPatcher::DerefPatch() { } } -base::LazyInstance<PaintPatcher> g_paint_patcher(base::LINKER_INITIALIZED); +base::LazyInstance<PaintPatcher> g_paint_patcher = LAZY_INSTANCE_INITIALIZER; // twips are a unit of type measurement, and RichEdit controls use them // to set offsets. diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc index edf75b8..a226188 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc @@ -86,7 +86,7 @@ class ChromeURLContentSecurityPolicyExceptionSet }; base::LazyInstance<ChromeURLContentSecurityPolicyExceptionSet> - g_chrome_url_content_security_policy_exceptions(base::LINKER_INITIALIZED); + g_chrome_url_content_security_policy_exceptions = LAZY_INSTANCE_INITIALIZER; // Parse a URL into the components used to resolve its request. |source_name| // is the hostname and |path| is the remaining portion of the URL. diff --git a/chrome/browser/ui/webui/constrained_html_ui.cc b/chrome/browser/ui/webui/constrained_html_ui.cc index bfb989f1..c0a5b84 100644 --- a/chrome/browser/ui/webui/constrained_html_ui.cc +++ b/chrome/browser/ui/webui/constrained_html_ui.cc @@ -18,7 +18,7 @@ #include "content/public/browser/notification_service.h" static base::LazyInstance<PropertyAccessor<ConstrainedHtmlUIDelegate*> > - g_constrained_html_ui_property_accessor(base::LINKER_INITIALIZED); + g_constrained_html_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; ConstrainedHtmlUI::ConstrainedHtmlUI(TabContents* contents) : ChromeWebUI(contents) { diff --git a/chrome/browser/ui/webui/html_dialog_ui.cc b/chrome/browser/ui/webui/html_dialog_ui.cc index 3f367f4..4d5b678 100644 --- a/chrome/browser/ui/webui/html_dialog_ui.cc +++ b/chrome/browser/ui/webui/html_dialog_ui.cc @@ -15,7 +15,7 @@ #include "content/public/common/bindings_policy.h" static base::LazyInstance<PropertyAccessor<HtmlDialogUIDelegate*> > - g_html_dialog_ui_property_accessor(base::LINKER_INITIALIZED); + g_html_dialog_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; HtmlDialogUI::HtmlDialogUI(TabContents* tab_contents) : ChromeWebUI(tab_contents) { diff --git a/chrome/browser/ui/webui/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview_ui.cc index fc7684e4..818e90a 100644 --- a/chrome/browser/ui/webui/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview_ui.cc @@ -62,7 +62,7 @@ class PrintPreviewRequestIdMapWithLock { // Written to on the UI thread, read from any thread. base::LazyInstance<PrintPreviewRequestIdMapWithLock> - g_print_preview_request_id_map(base::LINKER_INITIALIZED); + g_print_preview_request_id_map = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc index 2c84f2df..c1d4377 100644 --- a/chrome/browser/ui/webui/web_ui_browsertest.cc +++ b/chrome/browser/ui/webui/web_ui_browsertest.cc @@ -31,8 +31,8 @@ namespace { const FilePath::CharType kMockJS[] = FILE_PATH_LITERAL("mock4js.js"); const FilePath::CharType kWebUILibraryJS[] = FILE_PATH_LITERAL("test_api.js"); const FilePath::CharType kWebUITestFolder[] = FILE_PATH_LITERAL("webui"); -base::LazyInstance<std::vector<std::string> > error_messages_( - base::LINKER_INITIALIZED); +base::LazyInstance<std::vector<std::string> > error_messages_ = + LAZY_INSTANCE_INITIALIZER; // Intercepts all log messages. bool LogHandler(int severity, @@ -227,8 +227,8 @@ class MockWebUIProvider : public TestChromeWebUIFactory::WebUIProvider { } }; -base::LazyInstance<MockWebUIProvider> mock_provider_( - base::LINKER_INITIALIZED); +base::LazyInstance<MockWebUIProvider> mock_provider_ = + LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/common/extensions/extension_message_bundle.cc b/chrome/common/extensions/extension_message_bundle.cc index ea45721..6b6f5b2 100644 --- a/chrome/common/extensions/extension_message_bundle.cc +++ b/chrome/common/extensions/extension_message_bundle.cc @@ -325,8 +325,8 @@ struct ExtensionToMessagesMap { ExtensionToL10nMessagesMap messages_map; }; -static base::LazyInstance<ExtensionToMessagesMap> g_extension_to_messages_map( - base::LINKER_INITIALIZED); +static base::LazyInstance<ExtensionToMessagesMap> g_extension_to_messages_map = + LAZY_INSTANCE_INITIALIZER; ExtensionToMessagesMap::ExtensionToMessagesMap() {} diff --git a/chrome/common/profiling.cc b/chrome/common/profiling.cc index 1a56086..9422a90 100644 --- a/chrome/common/profiling.cc +++ b/chrome/common/profiling.cc @@ -91,7 +91,7 @@ class ProfilingThreadControl { base::LazyInstance<ProfilingThreadControl, base::LeakyLazyInstanceTraits<ProfilingThreadControl> > - g_flush_thread_control(base::LINKER_INITIALIZED); + g_flush_thread_control = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index 8ce4b25..d11b7ab 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -181,8 +181,8 @@ class TimeFormatter { DISALLOW_COPY_AND_ASSIGN(TimeFormatter); }; -static base::LazyInstance<TimeFormatter> g_time_formatter( - base::LINKER_INITIALIZED); +static base::LazyInstance<TimeFormatter> g_time_formatter = + LAZY_INSTANCE_INITIALIZER; void TimeFormatter::BuildFormats( FormatType format_type, std::vector<icu::PluralFormat*>* time_formats) { diff --git a/chrome/default_plugin/install_dialog.cc b/chrome/default_plugin/install_dialog.cc index 6462387..0ae91cf 100644 --- a/chrome/default_plugin/install_dialog.cc +++ b/chrome/default_plugin/install_dialog.cc @@ -14,7 +14,7 @@ #include "webkit/glue/webkit_glue.h" typedef base::hash_map<const std::wstring, PluginInstallDialog*> DialogMap; -base::LazyInstance<DialogMap> s_dialogs(base::LINKER_INITIALIZED); +base::LazyInstance<DialogMap> s_dialogs = LAZY_INSTANCE_INITIALIZER; PluginInstallDialog* PluginInstallDialog::AddInstaller( PluginInstallerImpl* plugin_impl, const std::wstring& plugin_name) { diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc index e3f344e..cce0d2f 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -20,8 +20,8 @@ namespace { const char kDistroDict[] = "distribution"; const char kFirstRunTabs[] = "first_run_tabs"; -base::LazyInstance<installer::MasterPreferences> g_master_preferences( - base::LINKER_INITIALIZED); +base::LazyInstance<installer::MasterPreferences> g_master_preferences = + LAZY_INSTANCE_INITIALIZER; bool GetGURLFromValue(const Value* in_value, GURL* out_value) { if (!in_value || !out_value) diff --git a/chrome/renderer/extensions/chrome_v8_extension.cc b/chrome/renderer/extensions/chrome_v8_extension.cc index 95a9fb8..1320a86 100644 --- a/chrome/renderer/extensions/chrome_v8_extension.cc +++ b/chrome/renderer/extensions/chrome_v8_extension.cc @@ -32,10 +32,10 @@ const char kValidateCallbacks[] = "validateCallbacks"; #endif typedef std::map<int, std::string> StringMap; -static base::LazyInstance<StringMap> g_string_map(base::LINKER_INITIALIZED); +static base::LazyInstance<StringMap> g_string_map = LAZY_INSTANCE_INITIALIZER; -static base::LazyInstance<ChromeV8Extension::InstanceSet> g_instances( - base::LINKER_INITIALIZED); +static base::LazyInstance<ChromeV8Extension::InstanceSet> g_instances = + LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/renderer/extensions/chrome_webstore_bindings.cc b/chrome/renderer/extensions/chrome_webstore_bindings.cc index d5e0a6c..9f8ed4f 100644 --- a/chrome/renderer/extensions/chrome_webstore_bindings.cc +++ b/chrome/renderer/extensions/chrome_webstore_bindings.cc @@ -50,10 +50,10 @@ const char kInvalidWebstoreItemUrlError[] = // (successful or not) via HandleInstallResponse. int g_next_install_id = 0; -base::LazyInstance<WeakV8FunctionMap> g_success_callbacks( - base::LINKER_INITIALIZED); -base::LazyInstance<WeakV8FunctionMap> g_failure_callbacks( - base::LINKER_INITIALIZED); +base::LazyInstance<WeakV8FunctionMap> g_success_callbacks = + LAZY_INSTANCE_INITIALIZER; +base::LazyInstance<WeakV8FunctionMap> g_failure_callbacks = + LAZY_INSTANCE_INITIALIZER; } // anonymous namespace diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index deb0180..00501b7 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -46,8 +46,8 @@ struct SingletonData { std::map<std::string, EventListenerCounts> listener_counts_; }; -static base::LazyInstance<SingletonData> g_singleton_data( - base::LINKER_INITIALIZED); +static base::LazyInstance<SingletonData> g_singleton_data = + LAZY_INSTANCE_INITIALIZER; static EventListenerCounts& GetListenerCounts(const std::string& extension_id) { return g_singleton_data.Get().listener_counts_[extension_id]; diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index 878aaf7..119590e 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -47,7 +47,8 @@ namespace { // document to another with adoptNode, and so having the object be a // RenderViewObserver means it might miss some notifications after it moves. typedef std::map<WebFrame*, UserScriptIdleScheduler*> SchedulerMap; -static base::LazyInstance<SchedulerMap> g_schedulers(base::LINKER_INITIALIZED); +static base::LazyInstance<SchedulerMap> g_schedulers = + LAZY_INSTANCE_INITIALIZER; } ExtensionHelper::ExtensionHelper(content::RenderView* render_view, diff --git a/chrome/renderer/extensions/miscellaneous_bindings.cc b/chrome/renderer/extensions/miscellaneous_bindings.cc index 46b84c9..e118608 100644 --- a/chrome/renderer/extensions/miscellaneous_bindings.cc +++ b/chrome/renderer/extensions/miscellaneous_bindings.cc @@ -45,8 +45,8 @@ struct ExtensionData { std::map<int, PortData> ports; // port ID -> data }; -static base::LazyInstance<ExtensionData> g_extension_data( - base::LINKER_INITIALIZED); +static base::LazyInstance<ExtensionData> g_extension_data = + LAZY_INSTANCE_INITIALIZER; static bool HasPortData(int port_id) { return g_extension_data.Get().ports.find(port_id) != diff --git a/chrome/renderer/extensions/schema_generated_bindings.cc b/chrome/renderer/extensions/schema_generated_bindings.cc index e85e4a3..902b160 100644 --- a/chrome/renderer/extensions/schema_generated_bindings.cc +++ b/chrome/renderer/extensions/schema_generated_bindings.cc @@ -79,8 +79,8 @@ struct PendingRequest { }; typedef std::map<int, linked_ptr<PendingRequest> > PendingRequestMap; -base::LazyInstance<PendingRequestMap> g_pending_requests( - base::LINKER_INITIALIZED); +base::LazyInstance<PendingRequestMap> g_pending_requests = + LAZY_INSTANCE_INITIALIZER; // A RenderViewVisitor class that iterates through the set of available // views, looking for a view of the given type, in the given browser window diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc index 8d18284..9a224fa 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc @@ -37,10 +37,10 @@ static GURL StripRef(const GURL& url) { typedef std::set<PhishingClassifierDelegate*> PhishingClassifierDelegates; static base::LazyInstance<PhishingClassifierDelegates> - g_delegates(base::LINKER_INITIALIZED); + g_delegates = LAZY_INSTANCE_INITIALIZER; static base::LazyInstance<scoped_ptr<const safe_browsing::Scorer> > - g_phishing_scorer(base::LINKER_INITIALIZED); + g_phishing_scorer = LAZY_INSTANCE_INITIALIZER; // static PhishingClassifierFilter* PhishingClassifierFilter::Create() { diff --git a/chrome/service/cloud_print/cloud_print_token_store.cc b/chrome/service/cloud_print/cloud_print_token_store.cc index e0bb0b0..dacbf94 100644 --- a/chrome/service/cloud_print/cloud_print_token_store.cc +++ b/chrome/service/cloud_print/cloud_print_token_store.cc @@ -10,7 +10,7 @@ // Keep the global CloudPrintTokenStore in a TLS slot so it is impossible to // incorrectly from the wrong thread. static base::LazyInstance<base::ThreadLocalPointer<CloudPrintTokenStore> > - lazy_tls(base::LINKER_INITIALIZED); + lazy_tls = LAZY_INSTANCE_INITIALIZER; CloudPrintTokenStore* CloudPrintTokenStore::current() { return lazy_tls.Pointer()->Get(); |