| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/sync_driver/model_association_manager.h" | 5 #include "components/sync_driver/model_association_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <functional> | 8 #include <functional> |
| 9 | 9 |
| 10 #include "base/debug/trace_event.h" | |
| 11 #include "base/logging.h" | 10 #include "base/logging.h" |
| 12 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 13 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
| 13 #include "base/trace_event/trace_event.h" |
| 14 #include "sync/internal_api/public/base/model_type.h" | 14 #include "sync/internal_api/public/base/model_type.h" |
| 15 | 15 |
| 16 using syncer::ModelTypeSet; | 16 using syncer::ModelTypeSet; |
| 17 | 17 |
| 18 namespace sync_driver { | 18 namespace sync_driver { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 static const syncer::ModelType kStartOrder[] = { | 22 static const syncer::ModelType kStartOrder[] = { |
| 23 syncer::NIGORI, // Listed for completeness. | 23 syncer::NIGORI, // Listed for completeness. |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 | 411 |
| 412 delegate_->OnModelAssociationDone(result); | 412 delegate_->OnModelAssociationDone(result); |
| 413 } | 413 } |
| 414 | 414 |
| 415 base::OneShotTimer<ModelAssociationManager>* | 415 base::OneShotTimer<ModelAssociationManager>* |
| 416 ModelAssociationManager::GetTimerForTesting() { | 416 ModelAssociationManager::GetTimerForTesting() { |
| 417 return &timer_; | 417 return &timer_; |
| 418 } | 418 } |
| 419 | 419 |
| 420 } // namespace sync_driver | 420 } // namespace sync_driver |
| OLD | NEW |