Minor GDataDB fixes.

chrome/browser/chromeos/gdata/gdata_db_unittest.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_db.h"
 
 #include "base/string_number_conversions.h"
 #include "chrome/browser/chromeos/gdata/gdata_db_factory.h"
 #include "chrome/browser/chromeos/gdata/gdata_files.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 43 matching lines @@
 
   // Tests GDataDB::NewIterator and GDataDBIter::GetNext.
   // Creates an iterator with start at |parent|, and iterates comparing with
   // expected |filenames|.
   void TestIter(const std::string& parent,
                 const char* file_paths[],
                 size_t file_paths_size);
 
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<GDataDB> gdata_db_;
-  std::set<GDataEntry*> entry_set_;
 };
 
 void GDataDBTest::SetUp() {
   profile_.reset(new TestingProfile());
   gdata_db_ = db_factory::CreateGDataDB(
       profile_->GetPath().Append("testdb"));
 }
 
 void GDataDBTest::TestGetNotFound(const GDataEntry& source) {
   scoped_ptr<GDataEntry> entry;
@@ skipping 20 matching lines @@
   EXPECT_EQ(GDataDB::DB_OK, status);
   ASSERT_TRUE(entry.get());
   EXPECT_EQ(source.title(), entry->title());
   EXPECT_EQ(source.resource_id(), entry->resource_id());
   EXPECT_EQ(source.content_url(), entry->content_url());
 }
 
 void GDataDBTest::InitDB() {
   int sequence_id = 1;
   GDataRootDirectory root;
-  GDataDirectory* dir1 = AddDirectory(NULL, &root, sequence_id++);
-  GDataDirectory* dir2 = AddDirectory(NULL, &root, sequence_id++);
+  GDataDirectory* dir1 = AddDirectory(&root, &root, sequence_id++);
+  GDataDirectory* dir2 = AddDirectory(&root, &root, sequence_id++);
   GDataDirectory* dir3 = AddDirectory(dir1, &root, sequence_id++);
 
   AddFile(dir1, &root, sequence_id++);
   AddFile(dir1, &root, sequence_id++);
 
   AddFile(dir2, &root, sequence_id++);
   AddFile(dir2, &root, sequence_id++);
   AddFile(dir2, &root, sequence_id++);
 
   AddFile(dir3, &root, sequence_id++);
   AddFile(dir3, &root, sequence_id++);
-
-  STLDeleteElements(&entry_set_);
 }
 
 GDataDirectory* GDataDBTest::AddDirectory(GDataDirectory* parent,
                                           GDataRootDirectory* root,
                                           int sequence_id) {
-  GDataDirectory* dir = new GDataDirectory(parent ? parent : root, root);
+  GDataDirectory* dir = new GDataDirectory(parent, root);
   const std::string dir_name = "dir" + base::IntToString(sequence_id);
   const std::string resource_id = std::string("dir_resource_id:") +
                                   dir_name;
   dir->set_title(dir_name);
-  dir->set_file_name(dir_name);
   dir->set_resource_id(resource_id);
+  parent->AddEntry(dir);
+
   GDataDB::Status status = gdata_db_->Put(*dir);
   EXPECT_EQ(GDataDB::DB_OK, status);
   DVLOG(1) << "AddDirectory " << dir->GetFilePath().value()
            << ", " << resource_id;
-  entry_set_.insert(dir);
   return dir;
 }
 
 GDataFile* GDataDBTest::AddFile(GDataDirectory* parent,
                                 GDataRootDirectory* root,
                                 int sequence_id) {
   GDataFile* file = new GDataFile(parent, root);
   const std::string title = "file" + base::IntToString(sequence_id);
   const std::string resource_id = std::string("file_resource_id:") +
                                   title;
   file->set_title(title);
-  file->set_file_name(title);
   file->set_resource_id(resource_id);
+  parent->AddEntry(file);
+
   GDataDB::Status status = gdata_db_->Put(*file);
   EXPECT_EQ(GDataDB::DB_OK, status);
   DVLOG(1) << "AddFile " << file->GetFilePath().value()
            << ", " << resource_id;
-  entry_set_.insert(file);
   return file;
 }
 
 void GDataDBTest::TestIter(const std::string& parent,
                            const char* file_paths[],
                            size_t file_paths_size) {
   scoped_ptr<GDataDBIter> iter = gdata_db_->CreateIterator(
       FilePath::FromUTF8Unsafe(parent));
   for (size_t i = 0; ; ++i) {
     scoped_ptr<GDataEntry> entry;
@@ skipping 106 matching lines @@
     "drive/dir2/file6",
     "drive/dir2/file7",
     "drive/dir2/file8",
   };
   TestIter("", all_entries, arraysize(all_entries));
 
   TestIter("dir4", NULL, 0);
 }
 
 }  // namespace gdata