Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util. h" 5 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util. h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h" 10 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 details.set_md5(md5); 81 details.set_md5(md5);
82 82
83 scoped_ptr<FileMetadata> metadata(new FileMetadata); 83 scoped_ptr<FileMetadata> metadata(new FileMetadata);
84 metadata->set_file_id(file_id); 84 metadata->set_file_id(file_id);
85 *metadata->mutable_details() = details; 85 *metadata->mutable_details() = details;
86 86
87 return metadata.Pass(); 87 return metadata.Pass();
88 } 88 }
89 89
90 scoped_ptr<FileTracker> CreateTracker(const FileMetadata& metadata, 90 scoped_ptr<FileTracker> CreateTracker(const FileMetadata& metadata,
91 int64 tracker_id, 91 int64_t tracker_id,
92 const FileTracker* parent_tracker) { 92 const FileTracker* parent_tracker) {
93 scoped_ptr<FileTracker> tracker(new FileTracker); 93 scoped_ptr<FileTracker> tracker(new FileTracker);
94 tracker->set_tracker_id(tracker_id); 94 tracker->set_tracker_id(tracker_id);
95 int64 parent_id = parent_tracker ? 95 int64_t parent_id =
96 parent_tracker->tracker_id() : kInvalidTrackerID; 96 parent_tracker ? parent_tracker->tracker_id() : kInvalidTrackerID;
97 tracker->set_parent_tracker_id(parent_id); 97 tracker->set_parent_tracker_id(parent_id);
98 tracker->set_file_id(metadata.file_id()); 98 tracker->set_file_id(metadata.file_id());
99 if (parent_tracker) 99 if (parent_tracker)
100 tracker->set_app_id(parent_tracker->app_id()); 100 tracker->set_app_id(parent_tracker->app_id());
101 tracker->set_tracker_kind(TRACKER_KIND_REGULAR); 101 tracker->set_tracker_kind(TRACKER_KIND_REGULAR);
102 *tracker->mutable_synced_details() = metadata.details(); 102 *tracker->mutable_synced_details() = metadata.details();
103 tracker->set_dirty(false); 103 tracker->set_dirty(false);
104 tracker->set_active(true); 104 tracker->set_active(true);
105 tracker->set_needs_folder_listing(false); 105 tracker->set_needs_folder_listing(false);
106 return tracker.Pass(); 106 return tracker.Pass();
107 } 107 }
108 108
109 scoped_ptr<FileTracker> CreatePlaceholderTracker( 109 scoped_ptr<FileTracker> CreatePlaceholderTracker(
110 const std::string& file_id, 110 const std::string& file_id,
111 int64 tracker_id, 111 int64_t tracker_id,
112 const FileTracker* parent_tracker) { 112 const FileTracker* parent_tracker) {
113 scoped_ptr<FileTracker> tracker(new FileTracker); 113 scoped_ptr<FileTracker> tracker(new FileTracker);
114 tracker->set_tracker_id(tracker_id); 114 tracker->set_tracker_id(tracker_id);
115 if (parent_tracker) 115 if (parent_tracker)
116 tracker->set_parent_tracker_id(parent_tracker->tracker_id()); 116 tracker->set_parent_tracker_id(parent_tracker->tracker_id());
117 tracker->set_file_id(file_id); 117 tracker->set_file_id(file_id);
118 if (parent_tracker) 118 if (parent_tracker)
119 tracker->set_app_id(parent_tracker->app_id()); 119 tracker->set_app_id(parent_tracker->app_id());
120 tracker->set_tracker_kind(TRACKER_KIND_REGULAR); 120 tracker->set_tracker_kind(TRACKER_KIND_REGULAR);
121 tracker->set_dirty(true); 121 tracker->set_dirty(true);
122 tracker->set_active(false); 122 tracker->set_active(false);
123 tracker->set_needs_folder_listing(false); 123 tracker->set_needs_folder_listing(false);
124 return tracker.Pass(); 124 return tracker.Pass();
125 } 125 }
126 126
127 FileResourceKind GetFileResourceKind( 127 FileResourceKind GetFileResourceKind(
128 const google_apis::FileResource& resource) { 128 const google_apis::FileResource& resource) {
129 if (resource.IsDirectory()) 129 if (resource.IsDirectory())
130 return RESOURCE_KIND_FOLDER; 130 return RESOURCE_KIND_FOLDER;
131 else 131 else
132 return RESOURCE_KIND_FILE; 132 return RESOURCE_KIND_FILE;
133 } 133 }
134 134
135 } // namespace test_util 135 } // namespace test_util
136 } // namespace drive_backend 136 } // namespace drive_backend
137 } // namespace sync_file_system 137 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698