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

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

Issue 437943002: [SyncFS] Remove usage of file task runner under drive_backend/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Work for nits Created 6 years, 4 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 | « no previous file | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/conflict_resolver.h" 5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 new FakeDriveServiceHelper(fake_drive_service.get(), 67 new FakeDriveServiceHelper(fake_drive_service.get(),
68 drive_uploader.get(), 68 drive_uploader.get(),
69 kSyncRootFolderTitle)); 69 kSyncRootFolderTitle));
70 remote_change_processor_.reset(new FakeRemoteChangeProcessor); 70 remote_change_processor_.reset(new FakeRemoteChangeProcessor);
71 71
72 context_.reset(new SyncEngineContext( 72 context_.reset(new SyncEngineContext(
73 fake_drive_service.PassAs<drive::DriveServiceInterface>(), 73 fake_drive_service.PassAs<drive::DriveServiceInterface>(),
74 drive_uploader.Pass(), 74 drive_uploader.Pass(),
75 NULL, 75 NULL,
76 base::ThreadTaskRunnerHandle::Get(), 76 base::ThreadTaskRunnerHandle::Get(),
77 base::ThreadTaskRunnerHandle::Get(),
78 base::ThreadTaskRunnerHandle::Get())); 77 base::ThreadTaskRunnerHandle::Get()));
79 context_->SetRemoteChangeProcessor(remote_change_processor_.get()); 78 context_->SetRemoteChangeProcessor(remote_change_processor_.get());
80 79
81 RegisterSyncableFileSystem(); 80 RegisterSyncableFileSystem();
82 81
83 sync_task_manager_.reset(new SyncTaskManager( 82 sync_task_manager_.reset(new SyncTaskManager(
84 base::WeakPtr<SyncTaskManager::Client>(), 83 base::WeakPtr<SyncTaskManager::Client>(),
85 10 /* maximum_background_task */, 84 10 /* maximum_background_task */,
86 base::ThreadTaskRunnerHandle::Get())); 85 base::ThreadTaskRunnerHandle::Get()));
87 sync_task_manager_->Initialize(SYNC_STATUS_OK); 86 sync_task_manager_->Initialize(SYNC_STATUS_OK);
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 513
515 EXPECT_EQ(4, CountParents(file)); 514 EXPECT_EQ(4, CountParents(file));
516 515
517 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); 516 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());
518 517
519 EXPECT_EQ(1, CountParents(file)); 518 EXPECT_EQ(1, CountParents(file));
520 } 519 }
521 520
522 } // namespace drive_backend 521 } // namespace drive_backend
523 } // namespace sync_file_system 522 } // namespace sync_file_system
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698