Refactor GDataWapiFeedLoader::LoadFromServer() parameters

chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_H_
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #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;
 }
 
 namespace gdata {
 
 class DriveWebAppsRegistryInterface;
 class DocumentFeed;
 class DocumentsServiceInterface;
 class GDataCache;
 struct GetDocumentsUiState;
 
 // Set of parameters sent to LoadDocumentFeedCallback callback.
 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,
                      GetDocumentsUiState* ui_state);
   ~GetDocumentsParams();
 
   // Changestamps are positive numbers in increasing order. The difference
   // between two changestamps is proportional equal to number of items in
   // delta feed between them - bigger the difference, more likely bigger
   // number of items in delta feeds.
   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;
   scoped_ptr<GetDocumentsUiState> ui_state;
 };
 
 // Defines set of parameters sent to callback OnProtoLoaded().
 struct LoadRootFeedParams {
   LoadRootFeedParams(
         bool should_load_from_server,
@@ skipping 56 matching lines @@
   // Then, it will initiate retrieval of the root feed from the server unless
   // |should_load_from_server| is set to false. |should_load_from_server| is
   // false only for testing. If loading from the server is successful, runs
   // |callback| if it was not previously run (i.e. loading from the cache was
   // successful).
   //
   // |callback| may be null.
   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.

[satorux1, 2012/08/17 16:00:12]

nit: move the last sentence to a separate line.

// |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(
       ContentOrigin initial_origin,
       int64 local_changestamp,
       const FileOperationCallback& callback);
 
   // Updates whole directory structure feeds collected in |feed_list|.
   // On success, returns PLATFORM_FILE_OK. Record file statistics as UMA
   // histograms.
   //
   // See comments at GDataWapiFeedProcessor::ApplyFeeds() for
   // |start_changestamp| and |root_feed_changestamp|.
   GDataFileError UpdateFromFeed(
     const std::vector<DocumentFeed*>& feed_list,
     int64 start_changestamp,
     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);
 
   // Continues handling root directory refresh after the directory service
   // is fully loaded.
   void ContinueWithInitializedDirectoryService(LoadRootFeedParams* params,
                                                GDataFileError error);
 
   // Helper callback for handling results of metadata retrieval initiated from
   // ReloadFeedFromServerIfNeeded(). This method makes a decision about fetching
@@ skipping 68 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<GDataWapiFeedLoader> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(GDataWapiFeedLoader);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_FEED_LOADER_H_