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

Side by Side Diff: chrome/browser/chromeos/drive/drive_integration_service_unittest.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/drive_integration_service.h" 5 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "chrome/browser/chromeos/drive/mock_file_system.h" 8 #include "chrome/browser/chromeos/drive/mock_file_system.h"
9 #include "chrome/browser/chromeos/drive/test_util.h" 9 #include "chrome/browser/chromeos/drive/test_util.h"
10 #include "chrome/browser/google_apis/dummy_drive_service.h" 10 #include "chrome/browser/google_apis/dummy_drive_service.h"
(...skipping 22 matching lines...) Expand all
33 } 33 }
34 34
35 virtual void TearDown() OVERRIDE { 35 virtual void TearDown() OVERRIDE {
36 delete integration_service_; 36 delete integration_service_;
37 file_system_ = NULL; 37 file_system_ = NULL;
38 google_apis::test_util::RunBlockingPoolTask(); 38 google_apis::test_util::RunBlockingPoolTask();
39 profile_.reset(); 39 profile_.reset();
40 } 40 }
41 41
42 protected: 42 protected:
43 MessageLoopForUI message_loop_; 43 base::MessageLoopForUI message_loop_;
44 content::TestBrowserThread ui_thread_; 44 content::TestBrowserThread ui_thread_;
45 45
46 scoped_ptr<TestingProfile> profile_; 46 scoped_ptr<TestingProfile> profile_;
47 47
48 MockFileSystem* file_system_; 48 MockFileSystem* file_system_;
49 DriveIntegrationService* integration_service_; 49 DriveIntegrationService* integration_service_;
50 }; 50 };
51 51
52 TEST_F(DriveIntegrationServiceTest, InitializeAndShutdown) { 52 TEST_F(DriveIntegrationServiceTest, InitializeAndShutdown) {
53 integration_service_->Initialize(); 53 integration_service_->Initialize();
54 google_apis::test_util::RunBlockingPoolTask(); 54 google_apis::test_util::RunBlockingPoolTask();
55 integration_service_->Shutdown(); 55 integration_service_->Shutdown();
56 } 56 }
57 57
58 } // namespace drive 58 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698