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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc

Issue 363373003: Replace MessageLoopProxy::current() with ThreadTaskRunnerHandle::Get() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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/sync_file_system/drive_backend/register_app_task.h" 5 #include "chrome/browser/sync_file_system/drive_backend/register_app_task.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/format_macros.h" 10 #include "base/format_macros.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/thread_task_runner_handle.h"
14 #include "chrome/browser/drive/drive_uploader.h" 15 #include "chrome/browser/drive/drive_uploader.h"
15 #include "chrome/browser/drive/fake_drive_service.h" 16 #include "chrome/browser/drive/fake_drive_service.h"
16 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h" 17 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h"
17 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" 18 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
18 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h" 19 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h"
19 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" 20 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
20 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" 21 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
21 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" 22 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
22 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" 23 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
23 #include "content/public/test/test_browser_thread_bundle.h" 24 #include "content/public/test/test_browser_thread_bundle.h"
(...skipping 20 matching lines...) Expand all
44 45
45 virtual void SetUp() OVERRIDE { 46 virtual void SetUp() OVERRIDE {
46 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); 47 ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
47 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); 48 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
48 49
49 scoped_ptr<drive::FakeDriveService> 50 scoped_ptr<drive::FakeDriveService>
50 fake_drive_service(new drive::FakeDriveService); 51 fake_drive_service(new drive::FakeDriveService);
51 scoped_ptr<drive::DriveUploaderInterface> 52 scoped_ptr<drive::DriveUploaderInterface>
52 drive_uploader(new drive::DriveUploader( 53 drive_uploader(new drive::DriveUploader(
53 fake_drive_service.get(), 54 fake_drive_service.get(),
54 base::MessageLoopProxy::current())); 55 base::ThreadTaskRunnerHandle::Get()));
55 56
56 fake_drive_service_helper_.reset(new FakeDriveServiceHelper( 57 fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
57 fake_drive_service.get(), drive_uploader.get(), 58 fake_drive_service.get(), drive_uploader.get(),
58 kSyncRootFolderTitle)); 59 kSyncRootFolderTitle));
59 60
60 context_.reset( 61 context_.reset(
61 new SyncEngineContext( 62 new SyncEngineContext(
62 fake_drive_service.PassAs<drive::DriveServiceInterface>(), 63 fake_drive_service.PassAs<drive::DriveServiceInterface>(),
63 drive_uploader.Pass(), 64 drive_uploader.Pass(),
64 NULL, 65 NULL,
65 base::MessageLoopProxy::current(), 66 base::ThreadTaskRunnerHandle::Get(),
66 base::MessageLoopProxy::current(), 67 base::ThreadTaskRunnerHandle::Get(),
67 base::MessageLoopProxy::current())); 68 base::ThreadTaskRunnerHandle::Get()));
68 69
69 ASSERT_EQ(google_apis::HTTP_CREATED, 70 ASSERT_EQ(google_apis::HTTP_CREATED,
70 fake_drive_service_helper_->AddOrphanedFolder( 71 fake_drive_service_helper_->AddOrphanedFolder(
71 kSyncRootFolderTitle, &sync_root_folder_id_)); 72 kSyncRootFolderTitle, &sync_root_folder_id_));
72 } 73 }
73 74
74 virtual void TearDown() OVERRIDE { 75 virtual void TearDown() OVERRIDE {
75 context_.reset(); 76 context_.reset();
76 base::RunLoop().RunUntilIdle(); 77 base::RunLoop().RunUntilIdle();
77 } 78 }
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 310
310 CreateMetadataDatabase(db.Pass()); 311 CreateMetadataDatabase(db.Pass());
311 RunRegisterAppTask(kAppID); 312 RunRegisterAppTask(kAppID);
312 313
313 EXPECT_EQ(1u, CountRegisteredAppRoot()); 314 EXPECT_EQ(1u, CountRegisteredAppRoot());
314 EXPECT_TRUE(IsAppRegistered(kAppID)); 315 EXPECT_TRUE(IsAppRegistered(kAppID));
315 } 316 }
316 317
317 } // namespace drive_backend 318 } // namespace drive_backend
318 } // namespace sync_file_system 319 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698