Refactor GDataWapiFeedLoader::LoadFromServer() parameters

chrome/browser/chromeos/gdata/gdata_file_system.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 2008 matching lines @@
     GDataFileError error,
     scoped_ptr<GDataEntryProto> entry_proto) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (error != GDATA_FILE_OK ||
       !entry_proto->file_info().is_directory()) {
     LOG(ERROR) << "Directory entry not found: " << file_path.value();
     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));
 }
 
 void GDataFileSystem::OnRequestDirectoryRefresh(
     const FilePath& directory_path,
     GetDocumentsParams* params,
     GDataFileError error) {
   DCHECK(params);
@@ skipping 380 matching lines @@
                                search_query,
                                next_feed,
                                CreateRelayCallback(callback)));
 }
 
 void GDataFileSystem::SearchAsyncOnUIThread(
     const std::string& search_query,
     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));
 }
 
 void GDataFileSystem::OnDirectoryChanged(const FilePath& directory_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   FOR_EACH_OBSERVER(GDataFileSystemInterface::Observer, observers_,
                     OnDirectoryChanged(directory_path));
 }
 
@@ skipping 992 matching lines @@
     return;
   }
 
   PlatformFileInfoProto entry_file_info;
   GDataEntry::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   callback.Run(GDATA_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace gdata