OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_file_sync_service.h" | 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 metadata_store_ = new DriveMetadataStore( | 166 metadata_store_ = new DriveMetadataStore( |
167 base_dir_, | 167 base_dir_, |
168 base::MessageLoopProxy::current()); | 168 base::MessageLoopProxy::current()); |
169 | 169 |
170 bool done = false; | 170 bool done = false; |
171 metadata_store_->Initialize(base::Bind(&DidInitialize, &done)); | 171 metadata_store_->Initialize(base::Bind(&DidInitialize, &done)); |
172 message_loop_.RunUntilIdle(); | 172 message_loop_.RunUntilIdle(); |
173 EXPECT_TRUE(done); | 173 EXPECT_TRUE(done); |
174 | 174 |
175 metadata_store_->SetSyncRootDirectory(kSyncRootResourceId); | 175 metadata_store_->SetSyncRootDirectory(kSyncRootResourceId); |
176 metadata_store_->AddBatchSyncOrigin(GURL(kAppOrigin), kParentResourceId); | 176 metadata_store_->AddIncrementalSyncOrigin(GURL(kAppOrigin), |
177 metadata_store_->MoveBatchSyncOriginToIncremental(GURL(kAppOrigin)); | 177 kParentResourceId); |
178 | 178 |
179 sync_service_ = DriveFileSyncService::CreateForTesting( | 179 sync_service_ = DriveFileSyncService::CreateForTesting( |
180 &profile_, | 180 &profile_, |
181 base_dir_, | 181 base_dir_, |
182 scoped_ptr<drive::APIUtilInterface>(fake_api_util_), | 182 scoped_ptr<drive::APIUtilInterface>(fake_api_util_), |
183 scoped_ptr<DriveMetadataStore>(metadata_store_)).Pass(); | 183 scoped_ptr<DriveMetadataStore>(metadata_store_)).Pass(); |
184 sync_service_->SetRemoteChangeProcessor(fake_remote_processor_.get()); | 184 sync_service_->SetRemoteChangeProcessor(fake_remote_processor_.get()); |
185 } | 185 } |
186 | 186 |
187 void TearDownForTestCase() { | 187 void TearDownForTestCase() { |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
425 TEST_F(DriveFileSyncServiceSyncTest, DeleteDirectoryTest) { | 425 TEST_F(DriveFileSyncServiceSyncTest, DeleteDirectoryTest) { |
426 std::string kDir = "dir title"; | 426 std::string kDir = "dir title"; |
427 SyncEvent sync_event[] = { | 427 SyncEvent sync_event[] = { |
428 CreateRemoteDirectoryAddEvent(kDir), | 428 CreateRemoteDirectoryAddEvent(kDir), |
429 CreateRemoteFileDeleteEvent(kDir), | 429 CreateRemoteFileDeleteEvent(kDir), |
430 }; | 430 }; |
431 RunTest(CreateTestCase(sync_event)); | 431 RunTest(CreateTestCase(sync_event)); |
432 } | 432 } |
433 | 433 |
434 } // namespace sync_file_system | 434 } // namespace sync_file_system |
OLD | NEW |