chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc - Issue 363373003: Replace MessageLoopProxy::current() with ThreadTaskRunnerHandle::Get()

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_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

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc ('k') | chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 <algorithm>	5 #include <algorithm>

6 #include <stack>	6 #include <stack>

7	7

8 #include "base/file_util.h"	8 #include "base/file_util.h"

9 #include "base/message_loop/message_loop.h"	9 #include "base/message_loop/message_loop.h"

10 #include "base/run_loop.h"	10 #include "base/run_loop.h"

	11 #include "base/thread_task_runner_handle.h"

11 #include "chrome/browser/drive/drive_uploader.h"	12 #include "chrome/browser/drive/drive_uploader.h"

12 #include "chrome/browser/drive/fake_drive_service.h"	13 #include "chrome/browser/drive/fake_drive_service.h"

13 #include "chrome/browser/drive/test_util.h"	14 #include "chrome/browser/drive/test_util.h"

14 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h"	15 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h"

15 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h"	16 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h"

16 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"	17 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"

17 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"	18 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"

18 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"	19 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"

19 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"	20 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"

20 #include "chrome/browser/sync_file_system/drive_backend/sync_worker.h"	21 #include "chrome/browser/sync_file_system/drive_backend/sync_worker.h"

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104	105

105 scoped_ptr<drive::DriveUploaderInterface> uploader(	106 scoped_ptr<drive::DriveUploaderInterface> uploader(

106 new drive::DriveUploader(drive_service.get(),	107 new drive::DriveUploader(drive_service.get(),

107 file_task_runner_.get()));	108 file_task_runner_.get()));

108	109

109 fake_drive_service_helper_.reset(new FakeDriveServiceHelper(	110 fake_drive_service_helper_.reset(new FakeDriveServiceHelper(

110 drive_service.get(), uploader.get(),	111 drive_service.get(), uploader.get(),

111 kSyncRootFolderTitle));	112 kSyncRootFolderTitle));

112	113

113 remote_sync_service_.reset(new SyncEngine(	114 remote_sync_service_.reset(new SyncEngine(

114 base::MessageLoopProxy::current(), // ui_task_runner	115 base::ThreadTaskRunnerHandle::Get(), // ui_task_runner

115 worker_task_runner_,	116 worker_task_runner_,

116 file_task_runner_,	117 file_task_runner_,

117 drive_task_runner,	118 drive_task_runner,

118 base_dir_.path(),	119 base_dir_.path(),

119 NULL, // task_logger	120 NULL, // task_logger

120 NULL, // notification_manager	121 NULL, // notification_manager

121 NULL, // extension_service	122 NULL, // extension_service

122 NULL, // signin_manager	123 NULL, // signin_manager

123 NULL, // token_service	124 NULL, // token_service

124 NULL, // request_context	125 NULL, // request_context

(...skipping 1570 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1695	1696

1696 EXPECT_EQ(1u, CountApp());	1697 EXPECT_EQ(1u, CountApp());

1697 EXPECT_EQ(1u, CountLocalFile(app_id));	1698 EXPECT_EQ(1u, CountLocalFile(app_id));

1698	1699

1699 EXPECT_EQ(2u, CountMetadata());	1700 EXPECT_EQ(2u, CountMetadata());

1700 EXPECT_EQ(2u, CountTracker());	1701 EXPECT_EQ(2u, CountTracker());

1701 }	1702 }

1702	1703

1703 } // namespace drive_backend	1704 } // namespace drive_backend

1704 } // namespace sync_file_system	1705 } // namespace sync_file_system

OLD	NEW