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

BUG=none

Review URL: https://chromiumcodereview.appspot.com/18419004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209986 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 6 insertions, 120 deletions

diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
index 92ca34f..1495563 100644
--- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
@@ -51,10 +51,6 @@ class ChangeListProcessorTest : public testing::Test {
     ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
   }
 
-  virtual void TearDown() OVERRIDE {
-    metadata_.reset();
-  }
-
   // Parses a json file at |test_data_path| relative to Chrome test directory
   // into a ScopedVector<drive::internal::ChangeList>.
   ScopedVector<ChangeList> ParseChangeList(const std::string& test_data_path) {
diff --git a/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc b/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc
index 605fa8b..941cc77 100644
--- a/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc
@@ -20,7 +20,6 @@ class DriveAppRegistryTest : public testing::Test {
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile);
 
-    // The fake object will be manually deleted in TearDown().
     fake_drive_service_.reset(new FakeDriveService);
     fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");
 
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
index fff153f..c0c3de1 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
@@ -51,10 +51,6 @@ class LocalReaderProxyTest : public ::testing::Test {
     ASSERT_TRUE(worker_thread_->Start());
   }
 
-  virtual void TearDown() OVERRIDE {
-    worker_thread_.reset();
-  }
-
   content::TestBrowserThreadBundle thread_bundle_;
 
   base::ScopedTempDir temp_dir_;
diff --git a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
index db8df9a..bc20801 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
@@ -24,12 +24,6 @@ class DriveIntegrationServiceTest : public testing::Test {
         new DummyFileSystem));
   }
 
-  virtual void TearDown() OVERRIDE {
-    integration_service_.reset();
-    google_apis::test_util::RunBlockingPoolTask();
-    profile_.reset();
-  }
-
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
diff --git a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
index 664af01..95dd8dc 100644
--- a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
@@ -129,16 +129,6 @@ class DriveURLRequestJobTest : public testing::Test {
     test_delegate_.reset(new TestDelegate);
   }
 
-  virtual void TearDown() OVERRIDE {
-    test_delegate_.reset();
-    url_request_context_.reset();
-    test_url_request_job_factory_.reset();
-    test_network_delegate_.reset();
-
-    fake_file_system_.reset();
-    fake_drive_service_.reset();
-  }
-
   FileSystemInterface* GetFileSystem() {
     return fake_file_system_.get();
   }
diff --git a/chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc b/chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc
index 804e7c5..7ceadf6 100644
--- a/chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc
@@ -17,18 +17,12 @@ namespace internal {
 
 class FileCacheMetadataTest : public testing::Test {
  public:
-  FileCacheMetadataTest() {}
-
   virtual void SetUp() OVERRIDE {
     // Create cache directories.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     metadata_.reset(new FileCacheMetadata(NULL));
   }
 
-  virtual void TearDown() OVERRIDE {
-    metadata_.reset();
-  }
-
  protected:
   base::ScopedTempDir temp_dir_;
   scoped_ptr<FileCacheMetadata> metadata_;
diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc
index be18599..8a8e37b 100644
--- a/chrome/browser/chromeos/drive/file_cache_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc
@@ -909,10 +909,6 @@ class FileCacheTest : public testing::Test {
     ASSERT_TRUE(cache_->Initialize());
   }
 
-  virtual void TearDown() OVERRIDE {
-    cache_.reset();
-  }
-
   static bool ImportOldDB(FileCache* cache, const base::FilePath& old_db_path) {
     return cache->ImportOldDB(old_db_path);
   }
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
index a9b3cb6..22b6b62 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
@@ -18,11 +18,6 @@ class MoveOperationTest : public OperationTestBase {
    operation_.reset(new MoveOperation(observer(), scheduler(), metadata()));
  }
 
- virtual void TearDown() OVERRIDE {
-   operation_.reset();
-   OperationTestBase::TearDown();
- }
-
  scoped_ptr<MoveOperation> operation_;
 };
 
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
index d62f914..91879c2 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
@@ -111,17 +111,6 @@ void OperationTestBase::SetUp() {
   ASSERT_EQ(FILE_ERROR_OK, error);
 }
 
-void OperationTestBase::TearDown() {
-  cache_.reset();
-  fake_free_disk_space_getter_.reset();
-  metadata_.reset();
-  scheduler_.reset();
-  fake_drive_service_.reset();
-  profile_.reset();
-
-  blocking_task_runner_ = NULL;
-}
-
 FileError OperationTestBase::GetLocalResourceEntry(const base::FilePath& path,
                                                    ResourceEntry* entry) {
   FileError error = FILE_ERROR_FAILED;
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
index 0ab1e82..fd44a80 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
@@ -71,7 +71,6 @@ class OperationTestBase : public testing::Test {
 
   // testing::Test overrides.
   virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
 
   // Returns the path of the temporary directory for putting test files.
   base::FilePath temp_dir() const { return temp_dir_.path(); }
diff --git a/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc
index e7517ec..58ba355 100644
--- a/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc
@@ -25,11 +25,6 @@ class UpdateOperationTest : public OperationTestBase {
                                         cache()));
  }
 
- virtual void TearDown() OVERRIDE {
-   operation_.reset();
-   OperationTestBase::TearDown();
- }
-
  scoped_ptr<UpdateOperation> operation_;
 };
 
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc
index 257a5aab..430539b 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,16 +297,17 @@ class FileSystemTest : public testing::Test {
   scoped_ptr<test_util::FakeNetworkChangeNotifier>
       fake_network_change_notifier_;
 
+  scoped_ptr<FakeDriveService> fake_drive_service_;
+  scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
+  scoped_ptr<JobScheduler> scheduler_;
+  scoped_ptr<MockDirectoryChangeObserver> mock_directory_observer_;
+
   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<MockDirectoryChangeObserver> mock_directory_observer_;
+  scoped_ptr<FileSystem> file_system_;
 };
 
 TEST_F(FileSystemTest, DuplicatedAsyncInitialization) {
diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
index 98874b8..57f3dbe 100644
--- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
@@ -109,15 +109,6 @@ class JobSchedulerTest : public testing::Test {
     scheduler_->SetDisableThrottling(true);
   }
 
-  virtual void TearDown() OVERRIDE {
-    // The scheduler should be deleted before NetworkLibrary, as it
-    // registers itself as observer of NetworkLibrary.
-    scheduler_.reset();
-    base::RunLoop().RunUntilIdle();
-    fake_drive_service_.reset();
-    fake_network_change_notifier_.reset();
-  }
-
  protected:
   // Sets up FakeNetworkChangeNotifier as if it's connected to a network with
   // the specified connection type.
diff --git a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc
index dd8acf4..0af9c0a 100644
--- a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc
+++ b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc
@@ -44,9 +44,6 @@ class LocalFileReaderAdapter {
 
 class LocalFileReaderTest : public ::testing::Test {
  protected:
-  LocalFileReaderTest() {
-  }
-
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     worker_thread_.reset(new base::Thread("LocalFileReaderTest"));
@@ -55,11 +52,6 @@ class LocalFileReaderTest : public ::testing::Test {
         new LocalFileReader(worker_thread_->message_loop_proxy()));
   }
 
-  virtual void TearDown() OVERRIDE {
-    file_reader_.reset();
-    worker_thread_.reset();
-  }
-
   base::MessageLoop message_loop_;
   base::ScopedTempDir temp_dir_;
   scoped_ptr<base::Thread> worker_thread_;
diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
index 3ecbf35..27608c6 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
@@ -870,9 +870,6 @@ class ResourceMetadataTest : public testing::Test {
     SetUpEntries(resource_metadata_.get());
   }
 
-  virtual void TearDown() OVERRIDE {
-  }
-
   base::ScopedTempDir temp_dir_;
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<ResourceMetadataStorage, test_util::DestroyHelperForTests>
diff --git a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
index 2132eaf..1392ac55 100644
--- a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
+++ b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
@@ -52,13 +52,6 @@ class WebkitFileStreamReaderImplTest : public ::testing::Test {
     fake_file_system_->Initialize();
   }
 
-  virtual void TearDown() OVERRIDE {
-    fake_file_system_.reset();
-    fake_drive_service_.reset();
-
-    worker_thread_.reset();
-  }
-
   FileSystemInterface* GetFileSystem() {
     return fake_file_system_.get();
   }
diff --git a/chrome/browser/drive/drive_uploader_unittest.cc b/chrome/browser/drive/drive_uploader_unittest.cc
index 1cb4b83..117cdba1 100644
--- a/chrome/browser/drive/drive_uploader_unittest.cc
+++ b/chrome/browser/drive/drive_uploader_unittest.cc
@@ -292,10 +292,6 @@ class DriveUploaderTest : public testing::Test {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
-  virtual void TearDown() OVERRIDE {
-    ASSERT_TRUE(temp_dir_.Delete());
-  }
-
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_dir_;
diff --git a/chrome/browser/google_apis/base_requests_server_unittest.cc b/chrome/browser/google_apis/base_requests_server_unittest.cc
index 74dad4c..58f8941 100644
--- a/chrome/browser/google_apis/base_requests_server_unittest.cc
+++ b/chrome/browser/google_apis/base_requests_server_unittest.cc
@@ -59,11 +59,6 @@ class BaseRequestsServerTest : public testing::Test {
                    base::Unretained(&http_request_)));
   }
 
-  virtual void TearDown() OVERRIDE {
-    EXPECT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
-    request_context_getter_ = NULL;
-  }
-
   // Returns a temporary file path suitable for storing the cache file.
   base::FilePath GetTestCachedFilePath(const base::FilePath& file_name) {
     return profile_->GetPath().Append(file_name);
diff --git a/chrome/browser/google_apis/drive_api_requests_unittest.cc b/chrome/browser/google_apis/drive_api_requests_unittest.cc
index 74f93cb..903e2df 100644
--- a/chrome/browser/google_apis/drive_api_requests_unittest.cc
+++ b/chrome/browser/google_apis/drive_api_requests_unittest.cc
@@ -100,12 +100,6 @@ class DriveApiRequestsTest : public testing::Test {
     content_length_ = 0;
   }
 
-  virtual void TearDown() OVERRIDE {
-    EXPECT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
-    request_context_getter_ = NULL;
-    ResetExpectedResponse();
-  }
-
   content::TestBrowserThreadBundle thread_bundle_;
   net::test_server::EmbeddedTestServer test_server_;
   scoped_ptr<TestingProfile> profile_;
diff --git a/chrome/browser/google_apis/gdata_wapi_requests_unittest.cc b/chrome/browser/google_apis/gdata_wapi_requests_unittest.cc
index cbdd2fa..39302ac 100644
--- a/chrome/browser/google_apis/gdata_wapi_requests_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_requests_unittest.cc
@@ -93,11 +93,6 @@ class GDataWapiRequestsTest : public testing::Test {
     content_length_ = 0;
   }
 
-  virtual void TearDown() OVERRIDE {
-    EXPECT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
-    request_context_getter_ = NULL;
-  }
-
  protected:
   // Handles a request for fetching a resource feed.
   scoped_ptr<net::test_server::HttpResponse> HandleResourceFeedRequest(