| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
| 8 | 8 |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/synchronization/waitable_event.h" | 10 #include "base/synchronization/waitable_event.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "content/test/test_browser_thread.h" | 40 #include "content/test/test_browser_thread.h" |
| 41 #include "testing/gmock/include/gmock/gmock.h" | 41 #include "testing/gmock/include/gmock/gmock.h" |
| 42 #include "webkit/glue/password_form.h" | 42 #include "webkit/glue/password_form.h" |
| 43 | 43 |
| 44 using base::Time; | 44 using base::Time; |
| 45 using browser_sync::PasswordChangeProcessor; | 45 using browser_sync::PasswordChangeProcessor; |
| 46 using browser_sync::PasswordDataTypeController; | 46 using browser_sync::PasswordDataTypeController; |
| 47 using browser_sync::PasswordModelAssociator; | 47 using browser_sync::PasswordModelAssociator; |
| 48 using browser_sync::TestIdFactory; | 48 using browser_sync::TestIdFactory; |
| 49 using browser_sync::UnrecoverableErrorHandler; | 49 using browser_sync::UnrecoverableErrorHandler; |
| 50 using content::BrowserThread; |
| 50 using sync_api::SyncManager; | 51 using sync_api::SyncManager; |
| 51 using sync_api::UserShare; | 52 using sync_api::UserShare; |
| 52 using syncable::BASE_VERSION; | 53 using syncable::BASE_VERSION; |
| 53 using syncable::CREATE; | 54 using syncable::CREATE; |
| 54 using syncable::DirectoryManager; | 55 using syncable::DirectoryManager; |
| 55 using syncable::IS_DEL; | 56 using syncable::IS_DEL; |
| 56 using syncable::IS_DIR; | 57 using syncable::IS_DIR; |
| 57 using syncable::IS_UNAPPLIED_UPDATE; | 58 using syncable::IS_UNAPPLIED_UPDATE; |
| 58 using syncable::IS_UNSYNCED; | 59 using syncable::IS_UNSYNCED; |
| 59 using syncable::MutableEntry; | 60 using syncable::MutableEntry; |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 AddPasswordEntriesTask node_task(this, sync_forms); | 618 AddPasswordEntriesTask node_task(this, sync_forms); |
| 618 | 619 |
| 619 StartSyncService(&root_task, &node_task); | 620 StartSyncService(&root_task, &node_task); |
| 620 | 621 |
| 621 std::vector<PasswordForm> new_sync_forms; | 622 std::vector<PasswordForm> new_sync_forms; |
| 622 GetPasswordEntriesFromSyncDB(&new_sync_forms); | 623 GetPasswordEntriesFromSyncDB(&new_sync_forms); |
| 623 | 624 |
| 624 EXPECT_EQ(1U, new_sync_forms.size()); | 625 EXPECT_EQ(1U, new_sync_forms.size()); |
| 625 EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0])); | 626 EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0])); |
| 626 } | 627 } |
| OLD | NEW |