| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 FilePath sync_file2 = temp_directory.AppendASCII("SyncData.sqlite3"); | 352 FilePath sync_file2 = temp_directory.AppendASCII("SyncData.sqlite3"); |
| 353 FilePath sync_file3 = temp_directory.AppendASCII("nonsense_file"); | 353 FilePath sync_file3 = temp_directory.AppendASCII("nonsense_file"); |
| 354 ASSERT_TRUE(file_util::CreateDirectory(temp_directory)); | 354 ASSERT_TRUE(file_util::CreateDirectory(temp_directory)); |
| 355 ASSERT_NE(-1, | 355 ASSERT_NE(-1, |
| 356 file_util::WriteFile(sync_file1, nonsense1, strlen(nonsense1))); | 356 file_util::WriteFile(sync_file1, nonsense1, strlen(nonsense1))); |
| 357 ASSERT_NE(-1, | 357 ASSERT_NE(-1, |
| 358 file_util::WriteFile(sync_file2, nonsense2, strlen(nonsense2))); | 358 file_util::WriteFile(sync_file2, nonsense2, strlen(nonsense2))); |
| 359 ASSERT_NE(-1, | 359 ASSERT_NE(-1, |
| 360 file_util::WriteFile(sync_file3, nonsense3, strlen(nonsense3))); | 360 file_util::WriteFile(sync_file3, nonsense3, strlen(nonsense3))); |
| 361 | 361 |
| 362 harness_.StartSyncServiceAndSetInitialSyncEnded(false, false, true, false, | 362 harness_.StartSyncServiceAndSetInitialSyncEnded(true, false, true, false, |
| 363 syncer::STORAGE_ON_DISK); | 363 syncer::STORAGE_ON_DISK); |
| 364 EXPECT_FALSE(harness_.service->HasSyncSetupCompleted()); | 364 EXPECT_FALSE(harness_.service->HasSyncSetupCompleted()); |
| 365 EXPECT_FALSE(harness_.service->sync_initialized()); | 365 EXPECT_FALSE(harness_.service->sync_initialized()); |
| 366 | 366 |
| 367 // Since we're doing synchronous initialization, backend should be | 367 // Since we're doing synchronous initialization, backend should be |
| 368 // initialized by this call. | 368 // initialized by this call. |
| 369 harness_.IssueTestTokens(); | 369 harness_.IssueTestTokens(); |
| 370 | 370 |
| 371 // Stop the service so we can read the new Sync Data files that were | 371 // Stop the service so we can read the new Sync Data files that were |
| 372 // created. | 372 // created. |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 namespace syncer { | 541 namespace syncer { |
| 542 namespace { | 542 namespace { |
| 543 | 543 |
| 544 // ProfileSyncService should behave just like an invalidator. | 544 // ProfileSyncService should behave just like an invalidator. |
| 545 INSTANTIATE_TYPED_TEST_CASE_P( | 545 INSTANTIATE_TYPED_TEST_CASE_P( |
| 546 ProfileSyncServiceInvalidatorTest, InvalidatorTest, | 546 ProfileSyncServiceInvalidatorTest, InvalidatorTest, |
| 547 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); | 547 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); |
| 548 | 548 |
| 549 } // namespace | 549 } // namespace |
| 550 } // namespace syncer | 550 } // namespace syncer |
| OLD | NEW |