Refactor GDataWapiFeedLoader::LoadFromServer() parameters

All the parameters for LoadFromServer() is consolidated in 
struct LoadFeedParams, and the function is made private in
GDataWapiFeedLoader class. Instead, SearchFromServer()
and LoadDirectoryFromServer() public methods are added to the class.
|should_fetch_multiple_feeds| parameter was never used with
false value, so it is removed.



BUG=141359
TEST=all tests pass, manually check file browser works.

Review URL: https://chromiumcodereview.appspot.com/10836285

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152252 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/gdata/gdata_file_system.cc

@@ -2033,15 +2033,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));
@@ -2442,21 +2436,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));
 }
 

chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.h

@@ -10,8 +10,7 @@
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/gdata/gdata_directory_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
-
-class GURL;
+#include "googleurl/src/gurl.h"
 
 namespace base {
 class Value;
@@ -30,7 +29,6 @@ struct GetDocumentsParams {
   GetDocumentsParams(int64 start_changestamp,
                      int64 root_feed_changestamp,
                      std::vector<DocumentFeed*>* feed_list,
-                     bool should_fetch_multiple_feeds,
                      const std::string& search_query,
                      const std::string& directory_resource_id,
                      const FileOperationCallback& callback,
@@ -44,9 +42,6 @@ struct GetDocumentsParams {
   int64 start_changestamp;
   int64 root_feed_changestamp;
   scoped_ptr<std::vector<DocumentFeed*> > feed_list;
-  // Should we stop after getting first feed chunk, even if there is more
-  // data.
-  bool should_fetch_multiple_feeds;
   std::string search_query;
   std::string directory_resource_id;
   FileOperationCallback callback;
@@ -123,35 +118,24 @@ class GDataWapiFeedLoader {
   void LoadFromCache(bool should_load_from_server,
                      const FileOperationCallback& callback);
 
-  // Starts root feed load from the server. Value of |start_changestamp|
-  // determines the type of feed to load - 0 means root feed, every other
-  // value would trigger delta feed.
-  // In the case of loading the root feed we use |root_feed_changestamp| as its
-  // initial changestamp value since it does not come with that info.
-  //
-  // When all feeds are loaded, |feed_load_callback| is invoked with the
-  // retrieved feeds. Then |load_finished_callback| is invoked with the error
-  // code.
-  //
-  // |should_fetch_multiple_feeds| is true iff don't want to stop feed loading
-  // after we retrieve first feed chunk.
-  // If invoked as a part of content search, query will be set in
-  // |search_query|.
-  // If |feed_to_load| is set, this is feed url that will be used to load feed.
-  //
-  // |load_finished_callback| may be null.
+  // Starts retrieving feed for a directory specified by |directory_resource_id|
+  // from the server. Upon completion, |feed_load_callback| is invoked.
   // |feed_load_callback| must not be null.
-  void LoadFromServer(
+  void LoadDirectoryFromServer(
       ContentOrigin initial_origin,
-      int64 start_changestamp,
-      int64 root_feed_changestamp,
-      bool should_fetch_multiple_feeds,
-      const std::string& search_query,
-      const GURL& feed_to_load,
       const std::string& directory_resource_id,
-      const FileOperationCallback& load_finished_callback,
       const LoadDocumentFeedCallback& feed_load_callback);
 
+  // Starts retrieving search results for |search_query| from the server.
+  // If |next_feed| is set, this is the feed url that will be fetched.
+  // If |next_feed| is an empty string, the default URL is used.
+  // Upon completion, |feed_load_callback| is invoked.
+  // |feed_load_callback| must not be null.
+  void SearchFromServer(ContentOrigin initial_origin,
+                        const std::string& search_query,
+                        const GURL& next_feed,
+                        const LoadDocumentFeedCallback& feed_load_callback);
+
   // Retrieves account metadata and determines from the last change timestamp
   // if the feed content loading from the server needs to be initiated.
   void ReloadFromServerIfNeeded(
@@ -171,6 +155,11 @@ class GDataWapiFeedLoader {
     int64 root_feed_changestamp);
 
  private:
+  struct LoadFeedParams;
+
+  // Starts root feed load from the server, with detail specified in |param|.
+  void LoadFromServer(const LoadFeedParams& param);
+
   // Callback for handling root directory refresh from the cache.
   void OnProtoLoaded(LoadRootFeedParams* params);