gdata: Add GDataDirectoryService::GetEntryInfoByResourceId()

chrome/browser/chromeos/gdata/gdata_directory_service.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_DIRECTORY_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DIRECTORY_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 170 matching lines @@
   void AddEntryToResourceMap(GDataEntry* entry);
 
   // Removes the entry from resource map.
   void RemoveEntryFromResourceMap(const std::string& resource_id);
 
   // Searches for |file_path| synchronously.
   // TODO(satorux): Replace this with an async version crbug.com/137160
   GDataEntry* FindEntryByPathSync(const FilePath& file_path);
 
   // Returns the GDataEntry* with the corresponding |resource_id|.
-  // TODO(achuith): Get rid of this in favor of async version crbug.com/13957.
+  // TODO(satorux): Remove this in favor of GetEntryInfoByResourceId()
+  // but can be difficult. See crbug.com/137374
   GDataEntry* GetEntryByResourceId(const std::string& resource_id);
 
   // Returns the GDataEntry* in the callback with the corresponding
-  // |resource_id|. TODO(achuith): Rename this to GetEntryByResourceId.
+  // |resource_id|. TODO(satorux): Remove this in favor of
+  // GetEntryInfoByResourceId(). crbug.com/137512
   void GetEntryByResourceIdAsync(const std::string& resource_id,
                                  const GetEntryByResourceIdCallback& callback);
 
+  // Finds an entry (a file or a directory) by |resource_id|.
+  //
+  // Must be called from UI thread. |callback| is run on UI thread.
+  // |callback| must not be null.
+  void GetEntryInfoByResourceId(const std::string& resource_id,
+                                const GetEntryInfoCallback& callback);
+
   // Finds an entry (a file or a directory) by |file_path|.
   //
   // Must be called from UI thread. |callback| is run on UI thread.
+  // |callback| must not be null.
   void GetEntryInfoByPath(const FilePath& file_path,
                           const GetEntryInfoCallback& callback);
 
   // Finds and reads a directory by |file_path|.
   //
   // Must be called from UI thread. |callback| is run on UI thread.
+  // |callback| must not be null.
   void ReadDirectoryByPath(const FilePath& file_path,
                            const ReadDirectoryCallback& callback);
 
   // Similar to GetEntryInfoByPath() but this function finds a pair of
   // entries by |first_path| and |second_path|. If the entry for
   // |first_path| is not found, this function does not try to get the
   // entry of |second_path|.
   //
   // Must be called from UI thread. |callback| is run on UI thread.
+  // |callback| must not be null.
   void GetEntryInfoPairByPaths(
       const FilePath& first_path,
       const FilePath& second_path,
       const GetEntryInfoPairCallback& callback);
 
   // Replaces file entry with the same resource id as |fresh_file| with its
   // fresh value |fresh_file|.
   void RefreshFile(scoped_ptr<GDataFile> fresh_file);
 
   // Removes all child files of |directory| and replace with file_map.
@@ skipping 73 matching lines @@
   // This should remain the last member so it'll be destroyed first and
   // invalidate its weak pointers before other members are destroyed.
   base::WeakPtrFactory<GDataDirectoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectoryService);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DIRECTORY_SERVICE_H_