OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/drive/drive_file_system.h" | 5 #include "chrome/browser/chromeos/drive/drive_file_system.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 } | 264 } |
265 | 265 |
266 bool LoadChangeFeed(const std::string& filename) { | 266 bool LoadChangeFeed(const std::string& filename) { |
267 return LoadFeed(filename, true); | 267 return LoadFeed(filename, true); |
268 } | 268 } |
269 | 269 |
270 bool LoadFeed(const std::string& filename, bool is_delta_feed) { | 270 bool LoadFeed(const std::string& filename, bool is_delta_feed) { |
271 if (!test_util::LoadChangeFeed(filename, | 271 if (!test_util::LoadChangeFeed(filename, |
272 file_system_->change_list_loader(), | 272 file_system_->change_list_loader(), |
273 is_delta_feed, | 273 is_delta_feed, |
| 274 fake_drive_service_->GetRootResourceId(), |
274 root_feed_changestamp_)) { | 275 root_feed_changestamp_)) { |
275 return false; | 276 return false; |
276 } | 277 } |
277 root_feed_changestamp_++; | 278 root_feed_changestamp_++; |
278 return true; | 279 return true; |
279 } | 280 } |
280 | 281 |
281 void AddDirectoryFromFile(const base::FilePath& directory_path, | 282 void AddDirectoryFromFile(const base::FilePath& directory_path, |
282 const std::string& filename) { | 283 const std::string& filename) { |
283 scoped_ptr<Value> atom = google_apis::test_util::LoadJSONFile(filename); | 284 scoped_ptr<Value> atom = google_apis::test_util::LoadJSONFile(filename); |
(...skipping 1925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2209 | 2210 |
2210 // An app for foo.exe should now be found, as the registry was loaded. | 2211 // An app for foo.exe should now be found, as the registry was loaded. |
2211 drive_webapps_registry_->GetWebAppsForFile( | 2212 drive_webapps_registry_->GetWebAppsForFile( |
2212 base::FilePath(FILE_PATH_LITERAL("foo.exe")), | 2213 base::FilePath(FILE_PATH_LITERAL("foo.exe")), |
2213 "" /* mime_type */, | 2214 "" /* mime_type */, |
2214 &apps); | 2215 &apps); |
2215 EXPECT_EQ(1U, apps.size()); | 2216 EXPECT_EQ(1U, apps.size()); |
2216 } | 2217 } |
2217 | 2218 |
2218 } // namespace drive | 2219 } // namespace drive |
OLD | NEW |