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

Unified Diff: chrome/browser/chromeos/drive/drive_test_util.cc

Issue 12588009: drive: Pass through AboutResouce from server among callbacks in ChangeListLoader. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/drive_test_util.cc
diff --git a/chrome/browser/chromeos/drive/drive_test_util.cc b/chrome/browser/chromeos/drive/drive_test_util.cc
index 8041045b3915ba70240608252e90efc9c6337cd1..f972449d35504e6b953af8eb2ee2f1c2ba455f9f 100644
--- a/chrome/browser/chromeos/drive/drive_test_util.cc
+++ b/chrome/browser/chromeos/drive/drive_test_util.cc
@@ -202,6 +202,7 @@ void CopyResultsFromCloseFileCallbackAndQuit(DriveFileError* out_error,
bool LoadChangeFeed(const std::string& relative_path,
ChangeListLoader* change_list_loader,
bool is_delta_feed,
+ const std::string& root_resource_id,
int64 root_feed_changestamp) {
scoped_ptr<Value> document =
google_apis::test_util::LoadJSONFile(relative_path);
@@ -218,10 +219,15 @@ bool LoadChangeFeed(const std::string& relative_path,
ScopedVector<google_apis::ResourceList> feed_list;
feed_list.push_back(document_feed.release());
+ scoped_ptr<google_apis::AboutResource> about_resource(
+ new google_apis::AboutResource);
+ about_resource->set_largest_change_id(root_feed_changestamp);
+ about_resource->set_root_folder_id(root_resource_id);
+
change_list_loader->UpdateFromFeed(
+ about_resource.Pass(),
feed_list,
is_delta_feed,
- root_feed_changestamp,
base::Bind(&base::DoNothing));
// ChangeListLoader::UpdateFromFeed is asynchronous, so wait for it to finish.
google_apis::test_util::RunBlockingPoolTask();

Powered by Google App Engine
This is Rietveld 408576698