diff options
| author | vadimt <vadimt@chromium.org> | 2014-10-21 18:11:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-22 04:03:24 +0000 |
| commit | 05d2b8936dddfd6bbac456c92b21d76afdf7bbc3 (patch) | |
| tree | c96e8819b38af57546239dc6a202686d381cbe29 /chrome/browser/extensions | |
| parent | 730bdd256a750c64663e30fcc0e998e4aa46e913 (diff) | |
| download | chromium_src-05d2b8936dddfd6bbac456c92b21d76afdf7bbc3.zip chromium_src-05d2b8936dddfd6bbac456c92b21d76afdf7bbc3.tar.gz chromium_src-05d2b8936dddfd6bbac456c92b21d76afdf7bbc3.tar.bz2 | |
Reverting instrumentations
Reverting instrumentations.
The bug is practically fixed, and profiler instrumentations are not necessary anymore.
BUG=417106
TBR=zelidrag@chromium.org, xians@chromium.org, hans@chromium.org, plundblad@chromium.org, komatsu@chromium.org, mfoltz@chromium.org, dcheng@chromium.org, tommycli@chromium.org, erikwright@chromium.org, rpaquay@chromium.org, mkwst@chromium.org, hongbo.min@intel.com, dvh@chromium.org, tbarzic@chromium.org, vitalybuka@chromium.org, jyasskin@chromium.org
Review URL: https://codereview.chromium.org/671783002
Cr-Commit-Position: refs/heads/master@{#300596}
Diffstat (limited to 'chrome/browser/extensions')
20 files changed, 0 insertions, 106 deletions
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 6748fcb..a340802 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,7 +9,6 @@ #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" @@ -272,11 +271,6 @@ 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 51d7b7f..6743eda 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -12,7 +12,6 @@ #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" @@ -397,10 +396,6 @@ 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 f5d8e50..cd2e5d9 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,7 +5,6 @@ #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" @@ -104,11 +103,6 @@ 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 d030557..d059071 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -13,7 +13,6 @@ #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" @@ -581,10 +580,6 @@ 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 a3cfa67..de6e61b 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -13,7 +13,6 @@ #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" @@ -311,10 +310,6 @@ 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 1137332..e3e893a 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc @@ -8,7 +8,6 @@ #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" @@ -275,10 +274,6 @@ 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 886d1a1..6b0659c 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -13,7 +13,6 @@ #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" @@ -223,10 +222,6 @@ 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")); - Profile* profile = Profile::FromBrowserContext(browser_context_); history_event_router_.reset(new HistoryEventRouter( profile, diff --git a/chrome/browser/extensions/api/idle/idle_manager.cc b/chrome/browser/extensions/api/idle/idle_manager.cc index c00bcc3..bd88cbc 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.cc +++ b/chrome/browser/extensions/api/idle/idle_manager.cc @@ -6,7 +6,6 @@ #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,10 +147,6 @@ 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 b1ea501..abef9a0e 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc @@ -4,7 +4,6 @@ #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" @@ -852,10 +851,6 @@ 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 33c061c..1f6a8ce 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -15,7 +15,6 @@ #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,10 +1016,6 @@ 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 572ae1e..9bc7fb3 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api.cc +++ b/chrome/browser/extensions/api/mdns/mdns_api.cc @@ -7,7 +7,6 @@ #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" @@ -70,10 +69,6 @@ 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 f3f0a81..3159d3b 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,7 +10,6 @@ #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" @@ -116,11 +115,6 @@ 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 b774546..e9885de 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,7 +4,6 @@ #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" @@ -88,11 +87,6 @@ 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 520f4fa..4d39671 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc @@ -9,7 +9,6 @@ #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" @@ -94,11 +93,6 @@ 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 b5e6716..1c6a729 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -10,7 +10,6 @@ #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" @@ -450,10 +449,6 @@ 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 cf4fd39..56a7cb7 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc @@ -9,7 +9,6 @@ #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" @@ -519,10 +518,6 @@ 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 0342ed2..f8dc1ff 100644 --- a/chrome/browser/extensions/api/sessions/sessions_api.cc +++ b/chrome/browser/extensions/api/sessions/sessions_api.cc @@ -9,7 +9,6 @@ #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" @@ -645,10 +644,6 @@ 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 b1945f4..0e8cc26 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,7 +11,6 @@ #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" @@ -118,11 +117,6 @@ 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 5f84141..641aad7 100644 --- a/chrome/browser/extensions/api/tabs/tabs_windows_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_windows_api.cc @@ -5,7 +5,6 @@ #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" @@ -79,10 +78,6 @@ 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 586dc32..24a4de3 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -7,7 +7,6 @@ #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" @@ -772,10 +771,6 @@ 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); |