Get rid of GetResourceList for ChangeListLoader::SearchFromServer method.

chrome/browser/chromeos/drive/change_list_loader.h

Index: chrome/browser/chromeos/drive/change_list_loader.h
diff --git a/chrome/browser/chromeos/drive/change_list_loader.h b/chrome/browser/chromeos/drive/change_list_loader.h
index f1849dd40bfa87161e88a4fdd3b27e07aad241b2..e1e9e889a3030fb3a7262e59b243808192246dc7 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.h
+++ b/chrome/browser/chromeos/drive/change_list_loader.h
@@ -82,11 +82,11 @@ class ChangeListLoader {
   // 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.
+  // Upon completion, |callback| is invoked.
+  // |callback| must not be null.
   void SearchFromServer(const std::string& search_query,
                         const GURL& next_feed,
-                        const LoadFeedListCallback& feed_load_callback);
+                        const LoadFeedListCallback& callback);
 
   // Initiates the change list loading from the server if the local
   // changestamp is older than the server changestamp.
@@ -231,6 +231,14 @@ class ChangeListLoader {
   void OnGetAppList(google_apis::GDataErrorCode status,
                     scoped_ptr<google_apis::AppList> app_list);
 
+  // Part of SearchFromServer. Called when ResourceList is fetched from the
+  // server.
+  // |callback| must not be null.
+  void SearchFromServerAfterGetResourceList(
+      const LoadFeedListCallback& callback,
+      google_apis::GDataErrorCode status,
+      scoped_ptr<google_apis::ResourceList> resource_list);
+
   // Callback for handling feed content fetching while searching for file info.
   // This callback is invoked after async feed fetch operation that was
   // invoked by StartDirectoryRefresh() completes. This callback will update