diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc index 667dfab9b89a19..4bace861965222 100644 --- a/content/browser/accessibility/browser_accessibility_android.cc +++ b/content/browser/accessibility/browser_accessibility_android.cc @@ -62,7 +62,7 @@ BrowserAccessibility* BrowserAccessibility::Create() { using UniqueIdMap = base::hash_map; // Map from each AXPlatformNode's unique id to its instance. -base::LazyInstance::DestructorAtExit g_unique_id_map = +base::LazyInstance::Leaky g_unique_id_map = LAZY_INSTANCE_INITIALIZER; // static diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc index c2fb402dfde2cd..369edfda8f88d9 100644 --- a/content/browser/accessibility/browser_accessibility_manager.cc +++ b/content/browser/accessibility/browser_accessibility_manager.cc @@ -42,7 +42,7 @@ BrowserAccessibility* FindNodeWithChildTreeId(BrowserAccessibility* node, // Map from AXTreeID to BrowserAccessibilityManager using AXTreeIDMap = base::hash_map; -base::LazyInstance::DestructorAtExit g_ax_tree_id_map = +base::LazyInstance::Leaky g_ax_tree_id_map = LAZY_INSTANCE_INITIALIZER; // A function to call when focus changes, for testing only. diff --git a/content/browser/accessibility/web_contents_accessibility_android.cc b/content/browser/accessibility/web_contents_accessibility_android.cc index 3925452224085a..38f4eb5048ed6c 100644 --- a/content/browser/accessibility/web_contents_accessibility_android.cc +++ b/content/browser/accessibility/web_contents_accessibility_android.cc @@ -186,9 +186,9 @@ enum { using SearchKeyToPredicateMap = base::hash_map; -base::LazyInstance::DestructorAtExit +base::LazyInstance::Leaky g_search_key_to_predicate_map = LAZY_INSTANCE_INITIALIZER; -base::LazyInstance::DestructorAtExit g_all_search_keys = +base::LazyInstance::Leaky g_all_search_keys = LAZY_INSTANCE_INITIALIZER; bool SectionPredicate(BrowserAccessibility* start, BrowserAccessibility* node) { diff --git a/ui/accessibility/platform/ax_platform_node_win.cc b/ui/accessibility/platform/ax_platform_node_win.cc index 05b390f3fc4c15..7d3ead2c18624e 100644 --- a/ui/accessibility/platform/ax_platform_node_win.cc +++ b/ui/accessibility/platform/ax_platform_node_win.cc @@ -163,12 +163,11 @@ namespace { typedef base::hash_set AXPlatformNodeWinSet; // Set of all AXPlatformNodeWin objects that were the target of an // alert event. -base::LazyInstance::DestructorAtExit g_alert_targets = +base::LazyInstance::Leaky g_alert_targets = LAZY_INSTANCE_INITIALIZER; -base::LazyInstance>:: - DestructorAtExit g_iaccessible2_usage_observer_list = - LAZY_INSTANCE_INITIALIZER; +base::LazyInstance>::Leaky + g_iaccessible2_usage_observer_list = LAZY_INSTANCE_INITIALIZER; } // namespace @@ -227,7 +226,7 @@ AXPlatformNode* AXPlatformNode::FromNativeViewAccessible( using UniqueIdMap = base::hash_map; // Map from each AXPlatformNode's unique id to its instance. -base::LazyInstance::DestructorAtExit g_unique_id_map = +base::LazyInstance::Leaky g_unique_id_map = LAZY_INSTANCE_INITIALIZER; // static