Revert 164876 - Set root resource ID upon full feed update.

chrome/browser/chromeos/drive/drive_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_DRIVE_DRIVE_FEED_LOADER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FEED_LOADER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 58 matching lines @@
   int64 start_changestamp;
   int64 root_feed_changestamp;
   std::string search_query;
   std::string directory_resource_id;
   GURL feed_to_load;
   bool load_subsequent_feeds;
   const LoadDocumentFeedCallback feed_load_callback;
   FileOperationCallback load_finished_callback;
   ScopedVector<google_apis::DocumentFeed> feed_list;
   scoped_ptr<GetDocumentsUiState> ui_state;
-  // On initial feed load for Drive API, remember root ID for
-  // DriveResourceData initialization later in UpdateFromFeed().
-  std::string root_resource_id;
 };
 
 // Defines set of parameters sent to callback OnProtoLoaded().
 struct LoadRootFeedParams {
   explicit LoadRootFeedParams(const FileOperationCallback& callback);
   ~LoadRootFeedParams();
 
   std::string proto;
   DriveFileError load_error;
   base::Time last_modified;
@@ skipping 42 matching lines @@
   // Retrieves account metadata and determines from the last change timestamp
   // if the feed content loading from the server needs to be initiated.
   // |callback| must not be null.
   void ReloadFromServerIfNeeded(const FileOperationCallback& callback);
 
   // Updates whole directory structure feeds collected in |feed_list|.
   // Record file statistics as UMA histograms.
   //
   // See comments at DriveFeedProcessor::ApplyFeeds() for
   // |start_changestamp| and |root_feed_changestamp|.
-  // |root_resource_id| is used for Drive API.
   void UpdateFromFeed(
-      const ScopedVector<google_apis::DocumentFeed>& feed_list,
-      int64 start_changestamp,
-      int64 root_feed_changestamp,
-      const std::string& root_resource_id);
+    const ScopedVector<google_apis::DocumentFeed>& feed_list,
+    int64 start_changestamp,
+    int64 root_feed_changestamp);
 
   // Indicates whether there is a feed refreshing server request is in flight.
   bool refreshing() const { return refreshing_; }
 
  private:
   // Starts root feed load from the server, with details specified in |params|.
   void LoadFromServer(scoped_ptr<LoadFeedParams> params);
 
   // Callback for handling root directory refresh from the cache.
   void OnProtoLoaded(LoadRootFeedParams* params);
@@ skipping 75 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<DriveFeedLoader> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(DriveFeedLoader);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FEED_LOADER_H_