ResourceId and unit test cleanup.

chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.cc

 // 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.
 
+#include <utility>
+
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chromeos/gdata/gdata_directory_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_feed_processor.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace gdata {
 
-namespace {
-
-// Recursively extracts the paths set of all sub-directories of |entry|.
-void GetChildDirectoryPaths(GDataEntry* entry,
-                            std::set<FilePath>* changed_dirs) {
-  GDataDirectory* dir = entry->AsGDataDirectory();
-  if (!dir)
-    return;
-
-  for (GDataDirectoryCollection::const_iterator it =
-       dir->child_directories().begin();
-       it != dir->child_directories().end(); ++it) {
-    GDataDirectory* child_dir = it->second;
-    changed_dirs->insert(child_dir->GetFilePath());
-    GetChildDirectoryPaths(child_dir, changed_dirs);
-  }
-}
-
-}  // namespace
-
 FeedToFileResourceMapUmaStats::FeedToFileResourceMapUmaStats()
     : num_regular_files(0),
       num_hosted_documents(0) {
 }
 
 FeedToFileResourceMapUmaStats::~FeedToFileResourceMapUmaStats() {
 }
 
 GDataWapiFeedProcessor::GDataWapiFeedProcessor(
     GDataDirectoryService* directory_service)
@@ skipping 166 matching lines @@
 }
 
 // static
 void GDataWapiFeedProcessor::
 RemoveEntryFromDirectoryAndCollectChangedDirectories(
     GDataDirectory* directory,
     GDataEntry* entry,
     std::set<FilePath>* changed_dirs) {
   // Get the list of all sub-directory paths, so we can notify their listeners
   // that they are smoked.
-  GetChildDirectoryPaths(entry, changed_dirs);
+  GDataDirectory* dir = entry->AsGDataDirectory();
+  if (dir)
+    dir->GetChildDirectoryPaths(changed_dirs);
   directory->RemoveEntry(entry);
 }
 
 GDataDirectory* GDataWapiFeedProcessor::FindDirectoryForNewEntry(
     GDataEntry* new_entry,
     const FileResourceIdMap& file_map,
     GDataDirectoryService* orphaned_dir_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   GDataDirectory* dir = NULL;
   // Added file.
@@ skipping 90 matching lines @@
     // If the code above fails to parse a feed, any GDataEntry instance
     // added to |file_by_url| is not managed by a GDataDirectory instance,
     // so we need to explicitly release them here.
     STLDeleteValues(file_map);
   }
 
   return error;
 }
 
 }  // namespace gdata