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

chrome/browser/chromeos/drive/file_system_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/drive/file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 65 matching lines @@
 }  // namespace
 
 class FileSystemTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile);
 
     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");
     fake_drive_service_->LoadAccountMetadataForWapi(
         "gdata/account_metadata.json");
 
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
     scheduler_.reset(new JobScheduler(profile_.get(),
                                       fake_drive_service_.get(),
@@ skipping 40 matching lines @@
     file_system_->AddObserver(mock_directory_observer_.get());
     file_system_->Initialize();
 
     // Disable delaying so that the sync starts immediately.
     file_system_->sync_client_for_testing()->set_delay_for_testing(
         base::TimeDelta::FromSeconds(0));
 
     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;
     file_system_->change_list_loader()->LoadIfNeeded(
         DirectoryFetchInfo(),
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
     return error == FILE_ERROR_OK;
   }
 
@@ skipping 134 matching lines @@
     SetUpResourceMetadataAndFileSystem();
 
     return true;
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
   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_;
 };
 
 TEST_F(FileSystemTest, DuplicatedAsyncInitialization) {
   base::RunLoop loop;
 
   int counter = 0;
   const GetResourceEntryCallback& callback = base::Bind(
       &AsyncInitializationCallback, &counter, 2, loop.QuitClosure());
 
@@ skipping 548 matching lines @@
       file_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Now able to remove the cache entry.
   EXPECT_EQ(FILE_ERROR_OK, cache_->Remove(entry->resource_id()));
 }
 
 }   // namespace drive