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

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

Issue 243583005: Revert of [SyncFS] Post tasks between SyncEngine and SyncWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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
« 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 drive_uploader_.reset(new FakeDriveUploader(fake_drive_service_.get())); 61 drive_uploader_.reset(new FakeDriveUploader(fake_drive_service_.get()));
62 fake_drive_helper_.reset( 62 fake_drive_helper_.reset(
63 new FakeDriveServiceHelper(fake_drive_service_.get(), 63 new FakeDriveServiceHelper(fake_drive_service_.get(),
64 drive_uploader_.get(), 64 drive_uploader_.get(),
65 kSyncRootFolderTitle)); 65 kSyncRootFolderTitle));
66 fake_remote_change_processor_.reset(new FakeRemoteChangeProcessor); 66 fake_remote_change_processor_.reset(new FakeRemoteChangeProcessor);
67 67
68 context_.reset(new SyncEngineContext( 68 context_.reset(new SyncEngineContext(
69 fake_drive_service_.get(), 69 fake_drive_service_.get(),
70 drive_uploader_.get(), 70 drive_uploader_.get(),
71 base::MessageLoopProxy::current(),
72 base::MessageLoopProxy::current())); 71 base::MessageLoopProxy::current()));
73 context_->SetRemoteChangeProcessor(fake_remote_change_processor_.get()); 72 context_->SetRemoteChangeProcessor(fake_remote_change_processor_.get());
74 73
75 RegisterSyncableFileSystem(); 74 RegisterSyncableFileSystem();
76 75
77 sync_task_manager_.reset(new SyncTaskManager( 76 sync_task_manager_.reset(new SyncTaskManager(
78 base::WeakPtr<SyncTaskManager::Client>(), 77 base::WeakPtr<SyncTaskManager::Client>(),
79 10 /* maximum_background_task */)); 78 10 /* maximum_background_task */));
80 sync_task_manager_->Initialize(SYNC_STATUS_OK); 79 sync_task_manager_->Initialize(SYNC_STATUS_OK);
81 } 80 }
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 517
519 EXPECT_EQ(4, CountParents(file)); 518 EXPECT_EQ(4, CountParents(file));
520 519
521 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); 520 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());
522 521
523 EXPECT_EQ(1, CountParents(file)); 522 EXPECT_EQ(1, CountParents(file));
524 } 523 }
525 524
526 } // namespace drive_backend 525 } // namespace drive_backend
527 } // namespace sync_file_system 526 } // 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