Refactor GDataWapiFeedLoader::LoadFromServer() parameters

chrome/browser/chromeos/gdata/gdata_file_system.cc

Index: chrome/browser/chromeos/gdata/gdata_file_system.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.cc b/chrome/browser/chromeos/gdata/gdata_file_system.cc
index 51f4a4c6a4b9023216b39626beb33981af6823ff..966147b6e9ae595aff17ee5afa5a6bce39849311 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.cc
@@ -2026,15 +2026,9 @@ void GDataFileSystem::RequestDirectoryRefreshOnUIThreadAfterGetEntryInfo(
     return;
   }
 
-  feed_loader_->LoadFromServer(
+  feed_loader_->LoadDirectoryFromServer(
       directory_service_->origin(),
-      0,  // start_changestamp - Not a delta feed.
-      0,  // root_feed_changestamp - Not used.
-      true,  // multiple feeds
-      std::string(),  // No search query
-      GURL(),  // feed_to_load - Feed not explicitly set
-      entry_proto->resource_id(),  // Load the feed for this directory.
-      FileOperationCallback(),  // load_finished_callback.
+      entry_proto->resource_id(),
       base::Bind(&GDataFileSystem::OnRequestDirectoryRefresh,
                  ui_weak_ptr_,
                  file_path));

[satorux1, 2012/08/17 11:01:31]

wow, six parameters are gone! Nice.

@@ -2435,21 +2429,11 @@ void GDataFileSystem::SearchAsyncOnUIThread(
     const GURL& next_feed,
     const SearchCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  scoped_ptr<std::vector<DocumentFeed*> > feed_list(
-      new std::vector<DocumentFeed*>);
 
-  ContentOrigin initial_origin = directory_service_->origin();
-  feed_loader_->LoadFromServer(
-      initial_origin,
-      0, 0,  // We don't use change stamps when fetching search
-      // data; we always fetch the whole result feed.
-      false,  // Stop fetching search results after first feed
-      // chunk to avoid displaying huge number of search
-      // results (especially since we don't cache them).
+  feed_loader_->SearchFromServer(
+      directory_service_->origin(),
       search_query,
       next_feed,
-      std::string(),  // No directory resource ID.
-      FileOperationCallback(),  // Not used.
       base::Bind(&GDataFileSystem::OnSearch, ui_weak_ptr_, callback));

[satorux1, 2012/08/17 11:01:31]

nice.

 }