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

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

Issue 2317023003: sync and signin: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 std::unique_ptr<drive::DriveUploaderInterface> uploader( 113 std::unique_ptr<drive::DriveUploaderInterface> uploader(
114 new drive::DriveUploader(drive_service.get(), file_task_runner_.get())); 114 new drive::DriveUploader(drive_service.get(), file_task_runner_.get()));
115 115
116 fake_drive_service_helper_.reset(new FakeDriveServiceHelper( 116 fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
117 drive_service.get(), uploader.get(), 117 drive_service.get(), uploader.get(),
118 kSyncRootFolderTitle)); 118 kSyncRootFolderTitle));
119 119
120 remote_sync_service_.reset( 120 remote_sync_service_.reset(
121 new SyncEngine(base::ThreadTaskRunnerHandle::Get(), // ui_task_runner 121 new SyncEngine(base::ThreadTaskRunnerHandle::Get(), // ui_task_runner
122 worker_task_runner_.get(), 122 worker_task_runner_.get(), drive_task_runner.get(),
123 drive_task_runner.get(), 123 worker_pool.get(), base_dir_.GetPath(),
124 worker_pool.get(),
125 base_dir_.path(),
126 nullptr, // task_logger 124 nullptr, // task_logger
127 nullptr, // notification_manager 125 nullptr, // notification_manager
128 nullptr, // extension_service 126 nullptr, // extension_service
129 nullptr, // signin_manager 127 nullptr, // signin_manager
130 nullptr, // token_service 128 nullptr, // token_service
131 nullptr, // request_context 129 nullptr, // request_context
132 nullptr, // drive_service 130 nullptr, // drive_service
133 in_memory_env_.get())); 131 in_memory_env_.get()));
134 remote_sync_service_->AddServiceObserver(this); 132 remote_sync_service_->AddServiceObserver(this);
135 remote_sync_service_->InitializeForTesting(std::move(drive_service), 133 remote_sync_service_->InitializeForTesting(std::move(drive_service),
(...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 1722
1725 EXPECT_EQ(1u, CountApp()); 1723 EXPECT_EQ(1u, CountApp());
1726 EXPECT_EQ(1u, CountLocalFile(app_id)); 1724 EXPECT_EQ(1u, CountLocalFile(app_id));
1727 1725
1728 EXPECT_EQ(2u, CountMetadata()); 1726 EXPECT_EQ(2u, CountMetadata());
1729 EXPECT_EQ(2u, CountTracker()); 1727 EXPECT_EQ(2u, CountTracker());
1730 } 1728 }
1731 1729
1732 } // namespace drive_backend 1730 } // namespace drive_backend
1733 } // namespace sync_file_system 1731 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698