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

Unified Diff: chrome/browser/chromeos/drive/drive_integration_service_unittest.cc

Issue 15753004: Introduce drive::DummyFileSystem and rewrite some tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/dummy_file_system.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
diff --git a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
index 827d92befb7b1c1cd53685b47ed0444f230bc663..e84bedbb4302a460ca61218f4ba6f0187210b0ed 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/chromeos/drive/drive_integration_service.h"
#include "base/message_loop.h"
-#include "chrome/browser/chromeos/drive/mock_file_system.h"
+#include "chrome/browser/chromeos/drive/dummy_file_system.h"
#include "chrome/browser/chromeos/drive/test_util.h"
#include "chrome/browser/google_apis/dummy_drive_service.h"
#include "chrome/test/base/testing_profile.h"
@@ -18,22 +18,19 @@ class DriveIntegrationServiceTest : public testing::Test {
public:
DriveIntegrationServiceTest() :
ui_thread_(content::BrowserThread::UI, &message_loop_),
- file_system_(NULL),
integration_service_(NULL) {}
virtual void SetUp() OVERRIDE {
profile_.reset(new TestingProfile);
- file_system_ = new MockFileSystem;
- integration_service_ = new DriveIntegrationService(
+ integration_service_.reset(new DriveIntegrationService(
profile_.get(),
new google_apis::DummyDriveService,
base::FilePath(),
- file_system_);
+ new DummyFileSystem));
}
virtual void TearDown() OVERRIDE {
- delete integration_service_;
- file_system_ = NULL;
+ integration_service_.reset();
google_apis::test_util::RunBlockingPoolTask();
profile_.reset();
}
@@ -41,11 +38,8 @@ class DriveIntegrationServiceTest : public testing::Test {
protected:
MessageLoopForUI message_loop_;
content::TestBrowserThread ui_thread_;
-
scoped_ptr<TestingProfile> profile_;
-
- MockFileSystem* file_system_;
- DriveIntegrationService* integration_service_;
+ scoped_ptr<DriveIntegrationService> integration_service_;
};
TEST_F(DriveIntegrationServiceTest, InitializeAndShutdown) {
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/dummy_file_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698