Get rid of GetResourceList for ChangeListLoader::SearchFromServer method.

chrome/browser/chromeos/drive/change_list_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_DRIVE_CHANGE_LIST_LOADER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 64 matching lines @@
   // Note that This function initiates the loading without comparing the
   // directory changestamp against the server changestamp. The primary
   // purpose of this function is to update parts of entries in the directory
   // which can stale over time, such as thumbnail URLs.
   void LoadDirectoryFromServer(const std::string& directory_resource_id,
                                const FileOperationCallback& 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.
+  // 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.
   // See the comment at Load() for |directory_fetch_info| parameter.
   // |callback| must not be null.
   // TODO(satorux): make this private. crbug.com/193417
   void LoadFromServerIfNeeded(const DirectoryFetchInfo& directory_fetch_info,
                               const FileOperationCallback& callback);
 
   // Updates whole directory structure feeds collected in |feed_list|.
@@ skipping 124 matching lines @@
     int64 start_changestamp,
     const FileOperationCallback& callback,
     DriveFileError error);
 
   // Callback for handling response from |DriveAPIService::GetAppList|.
   // If the application list is successfully parsed, passes the list to
   // Drive webapps registry.
   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
   // the content of the refreshed directory object and continue initially
   // started FindEntryByPath() request.
   void UpdateMetadataFromFeedAfterLoadFromServer(
       scoped_ptr<google_apis::AboutResource> about_resource,
       bool is_delta_feed,
       const FileOperationCallback& callback,
       ScopedVector<ChangeList> change_lists,
@@ skipping 60 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<ChangeListLoader> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ChangeListLoader);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_