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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_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
OLDNEW
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"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 scoped_ptr<drive::FakeDriveService> drive_service( 65 scoped_ptr<drive::FakeDriveService> drive_service(
66 new drive::FakeDriveService()); 66 new drive::FakeDriveService());
67 drive_service->Initialize("test@example.com"); 67 drive_service->Initialize("test@example.com");
68 ASSERT_TRUE(drive_service->LoadResourceListForWapi( 68 ASSERT_TRUE(drive_service->LoadResourceListForWapi(
69 "gdata/root_feed.json")); 69 "gdata/root_feed.json"));
70 70
71 scoped_ptr<drive::DriveUploaderInterface> uploader( 71 scoped_ptr<drive::DriveUploaderInterface> uploader(
72 new drive::DriveUploader(drive_service.get(), 72 new drive::DriveUploader(drive_service.get(),
73 file_task_runner_.get())); 73 file_task_runner_.get()));
74 74
75 fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
76 drive_service.get(), uploader.get(),
77 kSyncRootFolderTitle));
78
79 remote_sync_service_.reset(new SyncEngine( 75 remote_sync_service_.reset(new SyncEngine(
80 drive_service.PassAs<drive::DriveServiceInterface>(), 76 drive_service.PassAs<drive::DriveServiceInterface>(),
81 uploader.Pass(), 77 uploader.Pass(),
82 file_task_runner_.get(),
83 NULL, NULL, NULL)); 78 NULL, NULL, NULL));
84 remote_sync_service_->AddServiceObserver(this); 79 remote_sync_service_->AddServiceObserver(this);
85 remote_sync_service_->Initialize(base_dir_.path(), 80 remote_sync_service_->Initialize(
86 base::MessageLoopProxy::current(), 81 base_dir_.path(),
87 in_memory_env_.get()); 82 file_task_runner_.get(),
83 in_memory_env_.get());
88 remote_sync_service_->SetSyncEnabled(true); 84 remote_sync_service_->SetSyncEnabled(true);
89 85
86 fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
87 fake_drive_service(), drive_uploader(),
88 kSyncRootFolderTitle));
89
90 local_sync_service_->SetLocalChangeProcessor(remote_sync_service_.get()); 90 local_sync_service_->SetLocalChangeProcessor(remote_sync_service_.get());
91 remote_sync_service_->SetRemoteChangeProcessor(local_sync_service_.get()); 91 remote_sync_service_->SetRemoteChangeProcessor(local_sync_service_.get());
92 } 92 }
93 93
94 virtual void TearDown() OVERRIDE { 94 virtual void TearDown() OVERRIDE {
95 typedef std::map<std::string, CannedSyncableFileSystem*>::iterator iterator; 95 typedef std::map<std::string, CannedSyncableFileSystem*>::iterator iterator;
96 for (iterator itr = file_systems_.begin(); 96 for (iterator itr = file_systems_.begin();
97 itr != file_systems_.end(); ++itr) { 97 itr != file_systems_.end(); ++itr) {
98 itr->second->TearDown(); 98 itr->second->TearDown();
99 delete itr->second; 99 delete itr->second;
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 457
458 size_t CountTracker() { 458 size_t CountTracker() {
459 return metadata_database()->CountFileTracker(); 459 return metadata_database()->CountFileTracker();
460 } 460 }
461 461
462 drive::FakeDriveService* fake_drive_service() { 462 drive::FakeDriveService* fake_drive_service() {
463 return static_cast<drive::FakeDriveService*>( 463 return static_cast<drive::FakeDriveService*>(
464 remote_sync_service_->GetDriveService()); 464 remote_sync_service_->GetDriveService());
465 } 465 }
466 466
467 drive::DriveUploaderInterface* drive_uploader() {
468 return remote_sync_service_->GetDriveUploader();
469 }
470
467 FakeDriveServiceHelper* fake_drive_service_helper() { 471 FakeDriveServiceHelper* fake_drive_service_helper() {
468 return fake_drive_service_helper_.get(); 472 return fake_drive_service_helper_.get();
469 } 473 }
470 474
471 MetadataDatabase* metadata_database() { 475 MetadataDatabase* metadata_database() {
472 return remote_sync_service_->GetMetadataDatabase(); 476 return remote_sync_service_->GetMetadataDatabase();
473 } 477 }
474 478
475 private: 479 private:
476 content::TestBrowserThreadBundle thread_bundle_; 480 content::TestBrowserThreadBundle thread_bundle_;
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after
1575 1579
1576 EXPECT_EQ(1u, CountApp()); 1580 EXPECT_EQ(1u, CountApp());
1577 EXPECT_EQ(1u, CountLocalFile(app_id)); 1581 EXPECT_EQ(1u, CountLocalFile(app_id));
1578 1582
1579 EXPECT_EQ(2u, CountMetadata()); 1583 EXPECT_EQ(2u, CountMetadata());
1580 EXPECT_EQ(2u, CountTracker()); 1584 EXPECT_EQ(2u, CountTracker());
1581 } 1585 }
1582 1586
1583 } // namespace drive_backend 1587 } // namespace drive_backend
1584 } // namespace sync_file_system 1588 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698