| Index: chrome/browser/sync_file_system/drive_backend/tracker_id_set.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/tracker_id_set.cc b/chrome/browser/sync_file_system/drive_backend/tracker_id_set.cc
|
| index 9fc4bbabb18645ed497236d94e93c4e648237e90..0bb272d6803a6733f0280e7156e8f9a5014a758b 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/tracker_id_set.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/tracker_id_set.cc
|
| @@ -22,7 +22,7 @@ void TrackerIDSet::Insert(const FileTracker& tracker) {
|
| InsertInactiveTracker(tracker.tracker_id());
|
| }
|
|
|
| -void TrackerIDSet::InsertActiveTracker(int64 tracker_id) {
|
| +void TrackerIDSet::InsertActiveTracker(int64_t tracker_id) {
|
| DCHECK(tracker_id);
|
| DCHECK(!active_tracker_);
|
|
|
| @@ -30,14 +30,14 @@ void TrackerIDSet::InsertActiveTracker(int64 tracker_id) {
|
| tracker_ids_.insert(tracker_id);
|
| }
|
|
|
| -void TrackerIDSet::InsertInactiveTracker(int64 tracker_id) {
|
| +void TrackerIDSet::InsertInactiveTracker(int64_t tracker_id) {
|
| DCHECK(tracker_id);
|
| DCHECK_NE(active_tracker_, tracker_id);
|
|
|
| tracker_ids_.insert(tracker_id);
|
| }
|
|
|
| -void TrackerIDSet::Erase(int64 tracker_id) {
|
| +void TrackerIDSet::Erase(int64_t tracker_id) {
|
| DCHECK(ContainsKey(tracker_ids_, tracker_id));
|
|
|
| if (active_tracker_ == tracker_id)
|
| @@ -45,13 +45,13 @@ void TrackerIDSet::Erase(int64 tracker_id) {
|
| tracker_ids_.erase(tracker_id);
|
| }
|
|
|
| -void TrackerIDSet::Activate(int64 tracker_id) {
|
| +void TrackerIDSet::Activate(int64_t tracker_id) {
|
| DCHECK(!active_tracker_);
|
| DCHECK(ContainsKey(tracker_ids_, tracker_id));
|
| active_tracker_ = tracker_id;
|
| }
|
|
|
| -void TrackerIDSet::Deactivate(int64 tracker_id) {
|
| +void TrackerIDSet::Deactivate(int64_t tracker_id) {
|
| DCHECK_EQ(active_tracker_, tracker_id);
|
| DCHECK(ContainsKey(tracker_ids_, tracker_id));
|
| active_tracker_ = 0;
|
|
|