| Index: components/sync_driver/data_type_manager_impl.cc
|
| diff --git a/components/sync_driver/data_type_manager_impl.cc b/components/sync_driver/data_type_manager_impl.cc
|
| index 07f79c49639e09b294a38e091b568dd3b6b93740..86a08dea2a4d8012dbc80a2c53b1bbda5c625535 100644
|
| --- a/components/sync_driver/data_type_manager_impl.cc
|
| +++ b/components/sync_driver/data_type_manager_impl.cc
|
| @@ -13,6 +13,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/logging.h"
|
| #include "base/metrics/histogram.h"
|
| +#include "base/profiler/scoped_tracker.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "components/sync_driver/data_type_controller.h"
|
| @@ -349,12 +350,21 @@ void DataTypeManagerImpl::DownloadReady(
|
| syncer::ModelTypeSet high_priority_types_before,
|
| syncer::ModelTypeSet first_sync_types,
|
| syncer::ModelTypeSet failed_configuration_types) {
|
| + // TODO(erikchen): Remove ScopedTracker below once crbug.com/458406 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile1(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "458406 DataTypeManagerImpl::DownloadReady"));
|
| +
|
| DCHECK(state_ == DOWNLOAD_PENDING || state_ == CONFIGURING);
|
|
|
| // Persistence errors are reset after each backend configuration attempt
|
| // during which they would have been purged.
|
| data_type_status_table_.ResetPersistenceErrorsFrom(types_to_download);
|
|
|
| + // TODO(erikchen): Remove ScopedTracker below once crbug.com/458406 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile2(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "458406 DataTypeManagerImpl::DownloadReady::NeedsReconfigure"));
|
| // Ignore |failed_configuration_types| if we need to reconfigure
|
| // anyway.
|
| if (needs_reconfigure_) {
|
| @@ -363,6 +373,10 @@ void DataTypeManagerImpl::DownloadReady(
|
| return;
|
| }
|
|
|
| + // TODO(erikchen): Remove ScopedTracker below once crbug.com/458406 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile3(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "458406 DataTypeManagerImpl::DownloadReady::UnrecoverableError"));
|
| if (!failed_configuration_types.Empty()) {
|
| if (!unrecoverable_error_method_.is_null())
|
| unrecoverable_error_method_.Run();
|
| @@ -383,6 +397,10 @@ void DataTypeManagerImpl::DownloadReady(
|
|
|
| state_ = CONFIGURING;
|
|
|
| + // TODO(erikchen): Remove ScopedTracker below once crbug.com/458406 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile4(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "458406 DataTypeManagerImpl::DownloadReady::Associate"));
|
| // Pop and associate download-ready types.
|
| syncer::ModelTypeSet ready_types = types_to_download;
|
| CHECK(!download_types_queue_.empty());
|
| @@ -401,6 +419,10 @@ void DataTypeManagerImpl::DownloadReady(
|
| if (association_types_queue_.size() == 1u)
|
| StartNextAssociation();
|
|
|
| + // TODO(erikchen): Remove ScopedTracker below once crbug.com/458406 is fixed.
|
| + tracked_objects::ScopedTracker tracking_profile5(
|
| + FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| + "458406 DataTypeManagerImpl::DownloadReady::ConfigureDataTypes"));
|
| // Download types of low priority while configuring types of high priority.
|
| if (!new_types_to_download.Empty()) {
|
| configurer_->ConfigureDataTypes(
|
|
|