Remove destruction-only TearDown() methods in Drive related test.

chrome/browser/chromeos/drive/file_system_unittest.cc

Index: chrome/browser/chromeos/drive/file_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc
index 257a5aabc279829c7b8db77c82d60d5cacb46a09..38d887bb8e9e2671592ee7f173db19e730189e3f 100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -83,7 +83,6 @@ class FileSystemTest : public testing::Test {
     fake_network_change_notifier_.reset(
         new test_util::FakeNetworkChangeNotifier);
 
-    // The fake object will be manually deleted in TearDown().
     fake_drive_service_.reset(new FakeDriveService);
     fake_drive_service_->LoadResourceListForWapi(
         "gdata/root_feed.json");
@@ -144,16 +143,6 @@ class FileSystemTest : public testing::Test {
     ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
   }
 
-  virtual void TearDown() OVERRIDE {
-    ASSERT_TRUE(file_system_);
-    file_system_.reset();
-    scheduler_.reset();
-    fake_drive_service_.reset();
-    cache_.reset();
-    fake_network_change_notifier_.reset();
-    profile_.reset();
-  }
-
   // Loads the full resource list via FakeDriveService.
   bool LoadFullResourceList() {
     FileError error = FILE_ERROR_FAILED;
@@ -308,15 +297,15 @@ class FileSystemTest : public testing::Test {
   scoped_ptr<test_util::FakeNetworkChangeNotifier>
       fake_network_change_notifier_;
 
+  scoped_ptr<FakeDriveService> fake_drive_service_;

[hashimoto, 2013/07/03 07:58:47]

nit: Could you make the order here and the order in which SetUp() creates
objects same? (by reordering lines here, or reordering lines in SetUp())

[kinaba, 2013/07/03 10:06:58]

Done.

   scoped_ptr<internal::ResourceMetadataStorage,
              test_util::DestroyHelperForTests> metadata_storage_;
-  scoped_ptr<internal::FileCache, test_util::DestroyHelperForTests> cache_;
-  scoped_ptr<FileSystem> file_system_;
-  scoped_ptr<FakeDriveService> fake_drive_service_;
-  scoped_ptr<JobScheduler> scheduler_;
   scoped_ptr<internal::ResourceMetadata, test_util::DestroyHelperForTests>
       resource_metadata_;
   scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
+  scoped_ptr<internal::FileCache, test_util::DestroyHelperForTests> cache_;
+  scoped_ptr<JobScheduler> scheduler_;
+  scoped_ptr<FileSystem> file_system_;
   scoped_ptr<MockDirectoryChangeObserver> mock_directory_observer_;
 };