ResourceId and unit test cleanup.

chrome/browser/chromeos/gdata/gdata_directory_service.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 "chrome/browser/chromeos/gdata/gdata_directory_service.h"
 
 #include <leveldb/db.h>
+#include <utility>
 
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
 #include "base/sequenced_task_runner.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 210 matching lines @@
   root_->set_title(kGDataRootDirectory);
   root_->SetBaseNameFromTitle();
   root_->set_resource_id(root_id);
   AddEntryToResourceMap(root_.get());
 }
 
 void GDataDirectoryService::ClearRoot() {
   // Note that children have a reference to root_,
   // so we need to delete them here.
   root_->RemoveChildren();
-  RemoveEntryFromResourceMap(root_.get());
+  RemoveEntryFromResourceMap(root_->resource_id());
   DCHECK(resource_map_.empty());
   resource_map_.clear();
   root_.reset();
 }
 
 void GDataDirectoryService::AddEntryToDirectory(
     GDataDirectory* directory,
     GDataEntry* new_entry,
     const FileMoveCallback& callback) {
   DCHECK(directory);
@@ skipping 41 matching lines @@
   DCHECK(parent);
   DCHECK(!callback.is_null());
   DVLOG(1) << "RemoveEntryFromParent " << entry->GetFilePath().value();
 
   parent->RemoveEntry(entry);
   base::MessageLoopProxy::current()->PostTask(FROM_HERE,
       base::Bind(callback, GDATA_FILE_OK, parent->GetFilePath()));
 }
 
 void GDataDirectoryService::AddEntryToResourceMap(GDataEntry* entry) {
-  // GDataFileSystem has already locked.
   DVLOG(1) << "AddEntryToResourceMap " << entry->resource_id();
-  resource_map_.insert(std::make_pair(entry->resource_id(), entry));
+  DCHECK(!entry->resource_id().empty());
+  std::pair<ResourceMap::iterator, bool> ret =
+      resource_map_.insert(std::make_pair(entry->resource_id(), entry));
+  DCHECK(ret.second);  // resource_id did not previously exist in the map.
 }
 
-void GDataDirectoryService::RemoveEntryFromResourceMap(GDataEntry* entry) {
-  // GDataFileSystem has already locked.
-  resource_map_.erase(entry->resource_id());
+void GDataDirectoryService::RemoveEntryFromResourceMap(
+    const std::string& resource_id) {
+  DVLOG(1) << "RemoveEntryFromResourceMap " << resource_id;
+  DCHECK(!resource_id.empty());
+  size_t ret = resource_map_.erase(resource_id);
+  DCHECK_EQ(1u, ret);  // resource_id was found in the map.
 }
 
 GDataEntry* GDataDirectoryService::FindEntryByPathSync(
     const FilePath& file_path) {
   if (file_path == root_->GetFilePath())
     return root_.get();
 
   std::vector<FilePath::StringType> components;
   file_path.GetComponents(&components);
   GDataDirectory* current_dir = root_.get();
@@ skipping 144 matching lines @@
     callback.Run(GDATA_FILE_ERROR_NOT_FOUND, FilePath());
     return;
   }
 
   GDataDirectory* directory = directory_entry->AsGDataDirectory();
   if (!directory) {
     callback.Run(GDATA_FILE_ERROR_NOT_A_DIRECTORY, FilePath());
     return;
   }
 
+  DVLOG(1) << "RefreshDirectoryInternal";
   directory->RemoveChildFiles();
   // Add files from file_map.
   for (ResourceMap::const_iterator it = file_map.begin();
        it != file_map.end(); ++it) {
     scoped_ptr<GDataEntry> entry(it->second);
     // Skip if it's not a file (i.e. directory).
     if (!entry->AsGDataFile())
       continue;
     directory->AddEntry(entry.release());
   }
@@ skipping 271 matching lines @@
   DCHECK(result.get());
 
   result->second.path = second_path;
   result->second.error = error;
   result->second.proto = entry_proto.Pass();
 
   callback.Run(result.Pass());
 }
 
 }  // namespace gdata