| Index: chrome/browser/safe_browsing/safe_browsing_service.cc
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| index 358cfa2cd88d3196302dd707046bafb61c15b277..05b64cc1265424b4ca2acf9c1a223ee1956ea6ad 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| @@ -15,6 +15,7 @@
|
| #include "base/path_service.h"
|
| #include "base/prefs/pref_change_registrar.h"
|
| #include "base/prefs/pref_service.h"
|
| +#include "base/profiler/scoped_tracker.h"
|
| #include "base/stl_util.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/threading/thread.h"
|
| @@ -462,18 +463,34 @@ void SafeBrowsingService::StartOnIOThread(
|
| return;
|
| enabled_ = true;
|
|
|
| + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "455469 SafeBrowsingService::GetProtocolConfig"));
|
| SafeBrowsingProtocolConfig config = GetProtocolConfig();
|
|
|
| #if defined(FULL_SAFE_BROWSING)
|
| + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "455469 SafeBrowsingDatabaseManager::StartOnIOThread"));
|
| DCHECK(database_manager_.get());
|
| database_manager_->StartOnIOThread();
|
|
|
| + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "455469 SafeBrowsingProtocolManager::Create"));
|
| DCHECK(!protocol_manager_);
|
| protocol_manager_ = SafeBrowsingProtocolManager::Create(
|
| database_manager_.get(), url_request_context_getter, config);
|
| protocol_manager_->Initialize();
|
| #endif
|
|
|
| + // TODO(pkasting): Remove ScopedTracker below once crbug.com/455469 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "455469 SafeBrowsingPingManager::Create"));
|
| DCHECK(!ping_manager_);
|
| ping_manager_ = SafeBrowsingPingManager::Create(
|
| url_request_context_getter, config);
|
|
|