diff options
24 files changed, 127 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc index eebcdf0..5234e6d 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.cc +++ b/chrome/browser/chromeos/extensions/input_method_api.cc @@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" #include "base/lazy_instance.h" +#include "base/profiler/scoped_profile.h" #include "base/values.h" #include "chrome/browser/chromeos/extensions/input_method_event_router.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" @@ -116,6 +117,10 @@ void InputMethodAPI::Shutdown() { void InputMethodAPI::OnListenerAdded( const extensions::EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("InputMethodAPI::OnListenerAdded")); + DCHECK(!input_method_event_router_.get()); input_method_event_router_.reset( new chromeos::ExtensionInputMethodEventRouter(context_)); diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index a340802..6748fcb 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -9,6 +9,7 @@ #include "base/lazy_instance.h" #include "base/memory/linked_ptr.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" @@ -271,6 +272,11 @@ BookmarkManagerPrivateAPI::GetFactoryInstance() { void BookmarkManagerPrivateAPI::OnListenerAdded( const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "BookmarkManagerPrivateAPI::OnListenerAdded")); + EventRouter::Get(browser_context_)->UnregisterObserver(this); event_router_.reset(new BookmarkManagerPrivateEventRouter( browser_context_, diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 6743eda..51d7b7f 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -12,6 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/sha1.h" #include "base/stl_util.h" #include "base/strings/string16.h" @@ -396,6 +397,10 @@ BookmarksAPI::GetFactoryInstance() { } void BookmarksAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("BookmarksAPI::OnListenerAdded")); + bookmark_event_router_.reset( new BookmarkEventRouter(Profile::FromBrowserContext(browser_context_))); EventRouter::Get(browser_context_)->UnregisterObserver(this); diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc index d188cad..20e7a15 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.cc @@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h" #include "base/lazy_instance.h" +#include "base/profiler/scoped_profile.h" #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -103,6 +104,11 @@ void BrailleDisplayPrivateAPI::SetEventDelegateForTest( void BrailleDisplayPrivateAPI::OnListenerAdded( const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "BrailleDisplayPrivateAPI::OnListenerAdded")); + BrailleController* braille_controller = BrailleController::GetInstance(); if (!scoped_observer_.IsObserving(braille_controller)) scoped_observer_.Add(braille_controller); diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index d059071..d030557 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -13,6 +13,7 @@ #include "base/lazy_instance.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" +#include "base/profiler/scoped_profile.h" #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" @@ -580,6 +581,10 @@ BrowserContextKeyedAPIFactory<CookiesAPI>* CookiesAPI::GetFactoryInstance() { void CookiesAPI::OnListenerAdded( const extensions::EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("CookiesAPI::OnListenerAdded")); + cookies_event_router_.reset(new CookiesEventRouter(browser_context_)); EventRouter::Get(browser_context_)->UnregisterObserver(this); } diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index ad94981..6cffb10 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -13,6 +13,7 @@ #include "base/files/file_util.h" #include "base/i18n/file_util_icu.h" #include "base/lazy_instance.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" @@ -310,6 +311,10 @@ void DeveloperPrivateAPI::Shutdown() {} void DeveloperPrivateAPI::OnListenerAdded( const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("DeveloperPrivateAPI::OnListenerAdded")); + if (!developer_private_event_router_) { developer_private_event_router_.reset( new DeveloperPrivateEventRouter(profile_)); diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc index 9da1296..63d77e3 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc @@ -8,6 +8,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/stringprintf.h" #include "chrome/browser/local_discovery/cloud_device_list.h" #include "chrome/browser/local_discovery/cloud_print_printer_list.h" @@ -274,6 +275,10 @@ GcdPrivateAPIImpl::~GcdPrivateAPIImpl() { } void GcdPrivateAPIImpl::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("GcdPrivateAPIImpl::OnListenerAdded")); + if (details.event_name == gcd_private::OnDeviceStateChanged::kEventName || details.event_name == gcd_private::OnDeviceRemoved::kEventName) { num_device_listeners_++; diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index 0d7cd45..356373c 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -13,6 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/task/cancelable_task_tracker.h" @@ -230,6 +231,10 @@ void BrowserContextKeyedAPIFactory<HistoryAPI>::DeclareFactoryDependencies() { } void HistoryAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("HistoryAPI::OnListenerAdded")); + history_event_router_.reset( new HistoryEventRouter(Profile::FromBrowserContext(browser_context_))); EventRouter::Get(browser_context_)->UnregisterObserver(this); diff --git a/chrome/browser/extensions/api/idle/idle_manager.cc b/chrome/browser/extensions/api/idle/idle_manager.cc index 6d44958..8520b38 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.cc +++ b/chrome/browser/extensions/api/idle/idle_manager.cc @@ -6,6 +6,7 @@ #include <utility> +#include "base/profiler/scoped_profile.h" #include "base/stl_util.h" #include "chrome/browser/extensions/api/idle/idle_api_constants.h" #include "chrome/browser/profiles/profile.h" @@ -148,6 +149,10 @@ void IdleManager::OnExtensionUnloaded(content::BrowserContext* browser_context, } void IdleManager::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("IdleManager::OnListenerAdded")); + DCHECK(thread_checker_.CalledOnValidThread()); ++GetMonitor(details.extension_id)->listeners; diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc index 40c27bd..d051dab 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/input_method/input_method_engine.h" @@ -846,6 +847,10 @@ void InputImeAPI::OnExtensionUnloaded(content::BrowserContext* browser_context, } void InputImeAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("InputImeAPI::OnListenerAdded")); + InputMethodEngineInterface* engine = input_ime_event_router()->GetActiveEngine(details.extension_id); // Notifies the IME extension for IME ready with onActivate/onFocus events. diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 2b98537..d6329ad 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -15,6 +15,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -1017,6 +1018,10 @@ ManagementAPI::GetFactoryInstance() { } void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("ManagementAPI::OnListenerAdded")); + management_event_router_.reset(new ManagementEventRouter(browser_context_)); EventRouter::Get(browser_context_)->UnregisterObserver(this); } diff --git a/chrome/browser/extensions/api/mdns/mdns_api.cc b/chrome/browser/extensions/api/mdns/mdns_api.cc index 9bc7fb3..572ae1e 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api.cc +++ b/chrome/browser/extensions/api/mdns/mdns_api.cc @@ -7,6 +7,7 @@ #include <vector> #include "base/lazy_instance.h" +#include "base/profiler/scoped_profile.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/extensions/api/mdns.h" @@ -69,6 +70,10 @@ DnsSdRegistry* MDnsAPI::dns_sd_registry() { } void MDnsAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("MDnsAPI::OnListenerAdded")); + DCHECK(thread_checker_.CalledOnValidThread()); UpdateMDnsListeners(details); } diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc index 3159d3b..f3f0a81 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc @@ -10,6 +10,7 @@ #include "base/lazy_instance.h" #include "base/location.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h" @@ -115,6 +116,11 @@ MediaGalleriesPrivateAPI* MediaGalleriesPrivateAPI::Get( void MediaGalleriesPrivateAPI::OnListenerAdded( const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "MediaGalleriesPrivateAPI::OnListenerAdded")); + // Make sure MediaGalleriesPreferences is initialized. After that, // try to initialize the event router for the listener. // This method is called synchronously with the message handler for the diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc index 8185b74..11cdd70 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_event_router.h" +#include "base/profiler/scoped_profile.h" #include "chrome/browser/extensions/api/networking_private/networking_private_api.h" #include "chrome/browser/extensions/api/networking_private/networking_private_service_client.h" #include "chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h" @@ -87,6 +88,11 @@ void NetworkingPrivateEventRouterImpl::Shutdown() { void NetworkingPrivateEventRouterImpl::OnListenerAdded( const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "NetworkingPrivateEventRouterImpl::OnListenerAdded")); + // Start listening to events from the network state handler. StartOrStopListeningForNetworkChanges(); } diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc index 4d39671..520f4fa 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc @@ -9,6 +9,7 @@ #include "base/lazy_instance.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/api/preference/preference_api_constants.h" #include "chrome/browser/extensions/extension_service.h" @@ -93,6 +94,11 @@ ChromeDirectSettingAPI::GetFactoryInstance() { // EventRouter::Observer implementation. void ChromeDirectSettingAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "ChromeDirectSettingAPI::OnListenerAdded")); + EventRouter::Get(profile_)->UnregisterObserver(this); registrar_.Init(profile_->GetPrefs()); preference_whitelist.Get().RegisterPropertyListeners( diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index 1eeb6f0..c4cf8a6 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -10,6 +10,7 @@ #include "base/lazy_instance.h" #include "base/memory/singleton.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/values.h" @@ -449,6 +450,10 @@ PreferenceAPI* PreferenceAPI::Get(content::BrowserContext* context) { } void PreferenceAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("PreferenceAPI::OnListenerAdded")); + preference_event_router_.reset(new PreferenceEventRouter(profile_)); EventRouter::Get(profile_)->UnregisterObserver(this); } diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc index 56a7cb7..cf4fd39 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc @@ -9,6 +9,7 @@ #include "base/lazy_instance.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" @@ -518,6 +519,10 @@ ProcessesEventRouter* ProcessesAPI::processes_event_router() { } void ProcessesAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("ProcessesAPI::OnListenerAdded")); + // We lazily tell the TaskManager to start updating when listeners to the // processes.onUpdated or processes.onUpdatedWithMemory events arrive. processes_event_router()->ListenerAdded(); diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc index f8dc1ff..0342ed2 100644 --- a/chrome/browser/extensions/api/sessions/sessions_api.cc +++ b/chrome/browser/extensions/api/sessions/sessions_api.cc @@ -9,6 +9,7 @@ #include "base/i18n/rtl.h" #include "base/lazy_instance.h" #include "base/prefs/pref_service.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -644,6 +645,10 @@ SessionsAPI::GetFactoryInstance() { } void SessionsAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("SessionsAPI::OnListenerAdded")); + sessions_event_router_.reset( new SessionsEventRouter(Profile::FromBrowserContext(browser_context_))); EventRouter::Get(browser_context_)->UnregisterObserver(this); diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc index 0e8cc26..b1945f4 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc @@ -11,6 +11,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "base/profiler/scoped_profile.h" #include "base/values.h" #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h" #include "chrome/browser/extensions/extension_service.h" @@ -117,6 +118,11 @@ SignedInDevicesManager::~SignedInDevicesManager() {} void SignedInDevicesManager::OnListenerAdded( const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "SignedInDevicesManager::OnListenerAdded")); + for (ScopedVector<SignedInDevicesChangeObserver>::const_iterator it = change_observers_.begin(); it != change_observers_.end(); diff --git a/chrome/browser/extensions/api/tabs/tabs_windows_api.cc b/chrome/browser/extensions/api/tabs/tabs_windows_api.cc index 641aad7..5f84141 100644 --- a/chrome/browser/extensions/api/tabs/tabs_windows_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_windows_api.cc @@ -5,6 +5,7 @@ #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" #include "base/lazy_instance.h" +#include "base/profiler/scoped_profile.h" #include "chrome/browser/extensions/api/tabs/tabs_event_router.h" #include "chrome/browser/extensions/api/tabs/windows_event_router.h" #include "chrome/browser/profiles/profile.h" @@ -78,6 +79,10 @@ TabsWindowsAPI::GetFactoryInstance() { } void TabsWindowsAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("TabsWindowsAPI::OnListenerAdded")); + // Initialize the event routers. tabs_event_router(); windows_event_router(); diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index 24a4de3..586dc32 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -7,6 +7,7 @@ #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" #include "base/lazy_instance.h" +#include "base/profiler/scoped_profile.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h" @@ -771,6 +772,10 @@ WebNavigationAPI::GetFactoryInstance() { } void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("WebNavigationAPI::OnListenerAdded")); + web_navigation_event_router_.reset(new WebNavigationEventRouter( Profile::FromBrowserContext(browser_context_))); EventRouter::Get(browser_context_)->UnregisterObserver(this); diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc index 3ec1ef2..c760a48 100644 --- a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc +++ b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" +#include "base/profiler/scoped_profile.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" @@ -114,6 +115,11 @@ bool TtsEngineExtensionObserver::IsLoadedTtsEngine( void TtsEngineExtensionObserver::OnListenerAdded( const extensions::EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "TtsEngineExtensionObserver::OnListenerAdded")); + if (!IsLoadedTtsEngine(details.extension_id)) return; diff --git a/extensions/browser/api/bluetooth/bluetooth_api.cc b/extensions/browser/api/bluetooth/bluetooth_api.cc index 2e1e4bc..c59a084 100644 --- a/extensions/browser/api/bluetooth/bluetooth_api.cc +++ b/extensions/browser/api/bluetooth/bluetooth_api.cc @@ -9,6 +9,7 @@ #include "base/bind_helpers.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" +#include "base/profiler/scoped_profile.h" #include "content/public/browser/browser_thread.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_device.h" @@ -85,6 +86,10 @@ void BluetoothAPI::Shutdown() { } void BluetoothAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("BluetoothAPI::OnListenerAdded")); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (event_router()->IsBluetoothSupported()) event_router()->OnListenerAdded(); diff --git a/extensions/browser/api/system_info/system_info_api.cc b/extensions/browser/api/system_info/system_info_api.cc index 4f82610..488dc41 100644 --- a/extensions/browser/api/system_info/system_info_api.cc +++ b/extensions/browser/api/system_info/system_info_api.cc @@ -10,6 +10,7 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" +#include "base/profiler/scoped_profile.h" #include "base/strings/string_util.h" #include "base/values.h" #include "components/storage_monitor/removable_storage_observer.h" @@ -237,6 +238,10 @@ void SystemInfoAPI::Shutdown() { } void SystemInfoAPI::OnListenerAdded(const EventListenerInfo& details) { + // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed. + tracked_objects::ScopedProfile tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("SystemInfoAPI::OnListenerAdded")); + if (IsSystemStorageEvent(details.event_name)) { StorageMonitor::GetInstance()->EnsureInitialized( base::Bind(&AddEventListener, details.event_name)); |