Use DriveService for proper resource id resolution in ChangeListLoader.

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 <set>
 #include <string>
@@ skipping 14 matching lines @@
 class SequencedTaskRunner;
 }  // namespace base
 
 namespace google_apis {
 class AboutResource;
 class ResourceList;
 }  // namespace google_apis
 
 namespace drive {
 
+class DriveServiceInterface;
 class JobScheduler;
 class ResourceEntry;
 
 namespace internal {
 
 class ChangeList;
 class ChangeListLoaderObserver;
 class ChangeListProcessor;
 class DirectoryFetchInfo;
 class ResourceMetadata;
@@ skipping 12 matching lines @@
 // "resource list" refers to metadata from the server when fetching the full
 // resource metadata, or fetching directory contents, whereas "change list"
 // refers to metadata from the server when fetching changes (delta).
 class ChangeListLoader {
  public:
   // Resource feed fetcher from the server.
   class FeedFetcher;
 
   ChangeListLoader(base::SequencedTaskRunner* blocking_task_runner,
                    ResourceMetadata* resource_metadata,
-                   JobScheduler* scheduler);
+                   JobScheduler* scheduler,
+                   DriveServiceInterface* drive_service);
   ~ChangeListLoader();
 
   // Indicates whether there is a request for full resource list or change
   // list fetching is in flight (i.e. directory contents fetching does not
   // count).
   bool IsRefreshing() const;
 
   // Adds and removes the observer.
   void AddObserver(ChangeListLoaderObserver* observer);
   void RemoveObserver(ChangeListLoaderObserver* observer);
@@ skipping 180 matching lines @@
   // Notifies directory changes per the result of the change list processing.
   void UpdateFromChangeListAfterApply(
       ChangeListProcessor* change_list_processor,
       bool should_notify,
       base::Time start_time,
       const base::Closure& callback);
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   ResourceMetadata* resource_metadata_;  // Not owned.
   JobScheduler* scheduler_;  // Not owned.
+  DriveServiceInterface* drive_service_;  // Not owned.
   ObserverList<ChangeListLoaderObserver> observers_;
   typedef std::map<std::string, std::vector<FileOperationCallback> >
       LoadCallbackMap;
   LoadCallbackMap pending_load_callback_;
   FileOperationCallback pending_update_check_callback_;
 
   // Running feed fetcher.
   scoped_ptr<FeedFetcher> change_feed_fetcher_;
 
   // Set of the running feed fetcher for the fast fetch.
@@ skipping 13 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 internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_