Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: chrome/browser/chromeos/drive/file_system/operation_test_base.cc

Issue 18419004: Remove destruction-only TearDown() methods in Drive related test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" 5 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
6 6
7 #include "base/threading/sequenced_worker_pool.h" 7 #include "base/threading/sequenced_worker_pool.h"
8 #include "chrome/browser/chromeos/drive/change_list_loader.h" 8 #include "chrome/browser/chromeos/drive/change_list_loader.h"
9 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" 9 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
10 #include "chrome/browser/chromeos/drive/file_cache.h" 10 #include "chrome/browser/chromeos/drive/file_cache.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 internal::ChangeListLoader change_list_loader( 104 internal::ChangeListLoader change_list_loader(
105 blocking_task_runner_.get(), metadata_.get(), scheduler_.get()); 105 blocking_task_runner_.get(), metadata_.get(), scheduler_.get());
106 106
107 change_list_loader.LoadIfNeeded( 107 change_list_loader.LoadIfNeeded(
108 DirectoryFetchInfo(), 108 DirectoryFetchInfo(),
109 google_apis::test_util::CreateCopyResultCallback(&error)); 109 google_apis::test_util::CreateCopyResultCallback(&error));
110 google_apis::test_util::RunBlockingPoolTask(); 110 google_apis::test_util::RunBlockingPoolTask();
111 ASSERT_EQ(FILE_ERROR_OK, error); 111 ASSERT_EQ(FILE_ERROR_OK, error);
112 } 112 }
113 113
114 void OperationTestBase::TearDown() {
115 cache_.reset();
116 fake_free_disk_space_getter_.reset();
117 metadata_.reset();
118 scheduler_.reset();
119 fake_drive_service_.reset();
120 profile_.reset();
121
122 blocking_task_runner_ = NULL;
123 }
124
125 FileError OperationTestBase::GetLocalResourceEntry(const base::FilePath& path, 114 FileError OperationTestBase::GetLocalResourceEntry(const base::FilePath& path,
126 ResourceEntry* entry) { 115 ResourceEntry* entry) {
127 FileError error = FILE_ERROR_FAILED; 116 FileError error = FILE_ERROR_FAILED;
128 base::PostTaskAndReplyWithResult( 117 base::PostTaskAndReplyWithResult(
129 blocking_task_runner(), 118 blocking_task_runner(),
130 FROM_HERE, 119 FROM_HERE,
131 base::Bind(&internal::ResourceMetadata::GetResourceEntryByPath, 120 base::Bind(&internal::ResourceMetadata::GetResourceEntryByPath,
132 base::Unretained(metadata()), path, entry), 121 base::Unretained(metadata()), path, entry),
133 base::Bind(google_apis::test_util::CreateCopyResultCallback(&error))); 122 base::Bind(google_apis::test_util::CreateCopyResultCallback(&error)));
134 google_apis::test_util::RunBlockingPoolTask(); 123 google_apis::test_util::RunBlockingPoolTask();
135 return error; 124 return error;
136 } 125 }
137 126
138 } // namespace file_system 127 } // namespace file_system
139 } // namespace drive 128 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698