ResourceId and unit test cleanup.

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 163 matching lines @@
 
   // Removes |entry| from its parent. Calls |callback| with the path of the
   // parent directory. |callback| may not be null.
   void RemoveEntryFromParent(GDataEntry* entry,
                              const FileMoveCallback& callback);
 
   // Adds the entry to resource map.
   void AddEntryToResourceMap(GDataEntry* entry);
 
   // Removes the entry from resource map.
-  void RemoveEntryFromResourceMap(GDataEntry* entry);
+  void RemoveEntryFromResourceMap(const std::string& resource_id);

[satorux1, 2012/08/17 11:49:17]

nice! I guess you'll make it asynchronous in a separate patch.

 
   // Searches for |file_path| synchronously.
   // TODO(satorux): Replace this with an async version crbug.com/137160
   GDataEntry* FindEntryByPathSync(const FilePath& file_path);
 
   // Searches for |file_path| synchronously, and runs |callback|.
   // TODO(satorux): Replace this with an async version crbug.com/137160
   void FindEntryByPathAndRunSync(const FilePath& file_path,
                                  const FindEntryCallback& callback);
 
@@ skipping 110 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_