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

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

Issue 16871010: Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/dummy_file_system.h" 8 #include "chrome/browser/chromeos/drive/dummy_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"
11 #include "chrome/test/base/testing_profile.h" 11 #include "chrome/test/base/testing_profile.h"
12 #include "content/public/test/test_browser_thread.h" 12 #include "content/public/test/test_browser_thread.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 namespace drive { 15 namespace drive {
16 16
17 class DriveIntegrationServiceTest : public testing::Test { 17 class DriveIntegrationServiceTest : public testing::Test {
18 public: 18 public:
19 DriveIntegrationServiceTest() : 19 DriveIntegrationServiceTest()
20 ui_thread_(content::BrowserThread::UI, &message_loop_), 20 : ui_thread_(content::BrowserThread::UI, &message_loop_) {}
21 integration_service_(NULL) {}
22 21
23 virtual void SetUp() OVERRIDE { 22 virtual void SetUp() OVERRIDE {
24 profile_.reset(new TestingProfile); 23 profile_.reset(new TestingProfile);
25 integration_service_.reset(new DriveIntegrationService( 24 integration_service_.reset(new DriveIntegrationService(
26 profile_.get(), 25 profile_.get(),
27 new google_apis::DummyDriveService, 26 new google_apis::DummyDriveService,
28 base::FilePath(), 27 base::FilePath(),
29 new DummyFileSystem)); 28 new DummyFileSystem));
30 } 29 }
31 30
(...skipping 10 matching lines...) Expand all
42 scoped_ptr<DriveIntegrationService> integration_service_; 41 scoped_ptr<DriveIntegrationService> integration_service_;
43 }; 42 };
44 43
45 TEST_F(DriveIntegrationServiceTest, InitializeAndShutdown) { 44 TEST_F(DriveIntegrationServiceTest, InitializeAndShutdown) {
46 integration_service_->Initialize(); 45 integration_service_->Initialize();
47 google_apis::test_util::RunBlockingPoolTask(); 46 google_apis::test_util::RunBlockingPoolTask();
48 integration_service_->Shutdown(); 47 integration_service_->Shutdown();
49 } 48 }
50 49
51 } // namespace drive 50 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/cros_library.cc ('k') | chrome/browser/chromeos/drive/resource_metadata_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698