| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 | 363 |
| 364 WaitableEvent syncable_service_created_or_destroyed_; | 364 WaitableEvent syncable_service_created_or_destroyed_; |
| 365 | 365 |
| 366 const scoped_refptr<base::SingleThreadTaskRunner> db_thread_; | 366 const scoped_refptr<base::SingleThreadTaskRunner> db_thread_; |
| 367 const scoped_refptr<base::SingleThreadTaskRunner> ui_thread_; | 367 const scoped_refptr<base::SingleThreadTaskRunner> ui_thread_; |
| 368 | 368 |
| 369 DISALLOW_COPY_AND_ASSIGN(WebDataServiceFake); | 369 DISALLOW_COPY_AND_ASSIGN(WebDataServiceFake); |
| 370 }; | 370 }; |
| 371 | 371 |
| 372 ACTION_P(ReturnNewDataTypeManagerWithDebugListener, debug_listener) { | 372 ACTION_P(ReturnNewDataTypeManagerWithDebugListener, debug_listener) { |
| 373 return new syncer::DataTypeManagerImpl(debug_listener, arg1, arg2, arg3, | 373 return new syncer::DataTypeManagerImpl(arg0, debug_listener, arg2, arg3, arg4, |
| 374 arg4); | 374 arg5); |
| 375 } | 375 } |
| 376 | 376 |
| 377 class MockPersonalDataManager : public PersonalDataManager { | 377 class MockPersonalDataManager : public PersonalDataManager { |
| 378 public: | 378 public: |
| 379 MockPersonalDataManager() : PersonalDataManager("en-US") {} | 379 MockPersonalDataManager() : PersonalDataManager("en-US") {} |
| 380 MOCK_CONST_METHOD0(IsDataLoaded, bool()); | 380 MOCK_CONST_METHOD0(IsDataLoaded, bool()); |
| 381 MOCK_METHOD0(LoadProfiles, void()); | 381 MOCK_METHOD0(LoadProfiles, void()); |
| 382 MOCK_METHOD0(LoadCreditCards, void()); | 382 MOCK_METHOD0(LoadCreditCards, void()); |
| 383 MOCK_METHOD0(Refresh, void()); | 383 MOCK_METHOD0(Refresh, void()); |
| 384 }; | 384 }; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 } | 469 } |
| 470 | 470 |
| 471 void StartSyncService(const base::Closure& callback, | 471 void StartSyncService(const base::Closure& callback, |
| 472 bool will_fail_association, | 472 bool will_fail_association, |
| 473 syncer::ModelType type) { | 473 syncer::ModelType type) { |
| 474 SigninManagerBase* signin = profile_sync_service_bundle()->signin_manager(); | 474 SigninManagerBase* signin = profile_sync_service_bundle()->signin_manager(); |
| 475 signin->SetAuthenticatedAccountInfo("12345", "test_user@gmail.com"); | 475 signin->SetAuthenticatedAccountInfo("12345", "test_user@gmail.com"); |
| 476 CreateSyncService(std::move(sync_client_owned_), callback); | 476 CreateSyncService(std::move(sync_client_owned_), callback); |
| 477 | 477 |
| 478 EXPECT_CALL(*profile_sync_service_bundle()->component_factory(), | 478 EXPECT_CALL(*profile_sync_service_bundle()->component_factory(), |
| 479 CreateDataTypeManager(_, _, _, _, _)) | 479 CreateDataTypeManager(_, _, _, _, _, _)) |
| 480 .WillOnce(ReturnNewDataTypeManagerWithDebugListener( | 480 .WillOnce(ReturnNewDataTypeManagerWithDebugListener( |
| 481 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); | 481 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); |
| 482 | 482 |
| 483 EXPECT_CALL(personal_data_manager(), IsDataLoaded()) | 483 EXPECT_CALL(personal_data_manager(), IsDataLoaded()) |
| 484 .WillRepeatedly(Return(true)); | 484 .WillRepeatedly(Return(true)); |
| 485 | 485 |
| 486 // We need tokens to get the tests going | 486 // We need tokens to get the tests going |
| 487 profile_sync_service_bundle()->auth_service()->UpdateCredentials( | 487 profile_sync_service_bundle()->auth_service()->UpdateCredentials( |
| 488 signin->GetAuthenticatedAccountId(), "oauth2_login_token"); | 488 signin->GetAuthenticatedAccountId(), "oauth2_login_token"); |
| 489 | 489 |
| (...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1500 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); | 1500 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); |
| 1501 EXPECT_EQ(3U, sync_entries.size()); | 1501 EXPECT_EQ(3U, sync_entries.size()); |
| 1502 EXPECT_EQ(0U, sync_profiles.size()); | 1502 EXPECT_EQ(0U, sync_profiles.size()); |
| 1503 for (size_t i = 0; i < sync_entries.size(); i++) { | 1503 for (size_t i = 0; i < sync_entries.size(); i++) { |
| 1504 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() << ", " | 1504 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() << ", " |
| 1505 << sync_entries[i].key().value(); | 1505 << sync_entries[i].key().value(); |
| 1506 } | 1506 } |
| 1507 } | 1507 } |
| 1508 | 1508 |
| 1509 } // namespace browser_sync | 1509 } // namespace browser_sync |
| OLD | NEW |