| 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 // TODO(akalin): This file is basically just a unit test for | 5 // TODO(akalin): This file is basically just a unit test for |
| 6 // BookmarkChangeProcessor. Write unit tests for | 6 // BookmarkChangeProcessor. Write unit tests for |
| 7 // BookmarkModelAssociator separately. | 7 // BookmarkModelAssociator separately. |
| 8 | 8 |
| 9 #include <stack> | 9 #include <stack> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/file_path.h" | 13 #include "base/file_path.h" |
| 14 #include "base/file_util.h" | 14 #include "base/file_util.h" |
| 15 #include "base/location.h" |
| 15 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/message_loop.h" | 17 #include "base/message_loop.h" |
| 17 #include "base/string16.h" | 18 #include "base/string16.h" |
| 18 #include "base/string_number_conversions.h" | 19 #include "base/string_number_conversions.h" |
| 19 #include "base/string_util.h" | 20 #include "base/string_util.h" |
| 20 #include "base/tracked.h" | |
| 21 #include "base/utf_string_conversions.h" | 21 #include "base/utf_string_conversions.h" |
| 22 #include "chrome/browser/bookmarks/bookmark_model.h" | 22 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 23 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 23 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" |
| 24 #include "chrome/browser/sync/api/sync_error.h" | 24 #include "chrome/browser/sync/api/sync_error.h" |
| 25 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 25 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
| 26 #include "chrome/browser/sync/glue/bookmark_model_associator.h" | 26 #include "chrome/browser/sync/glue/bookmark_model_associator.h" |
| 27 #include "chrome/browser/sync/internal_api/change_record.h" | 27 #include "chrome/browser/sync/internal_api/change_record.h" |
| 28 #include "chrome/browser/sync/internal_api/read_node.h" | 28 #include "chrome/browser/sync/internal_api/read_node.h" |
| 29 #include "chrome/browser/sync/internal_api/read_transaction.h" | 29 #include "chrome/browser/sync/internal_api/read_transaction.h" |
| 30 #include "chrome/browser/sync/internal_api/write_node.h" | 30 #include "chrome/browser/sync/internal_api/write_node.h" |
| (...skipping 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1431 // Make sure we're back in sync. In real life, the user would need | 1431 // Make sure we're back in sync. In real life, the user would need |
| 1432 // to reauthenticate before this happens, but in the test, authentication | 1432 // to reauthenticate before this happens, but in the test, authentication |
| 1433 // is sidestepped. | 1433 // is sidestepped. |
| 1434 ExpectBookmarkModelMatchesTestData(); | 1434 ExpectBookmarkModelMatchesTestData(); |
| 1435 ExpectModelMatch(); | 1435 ExpectModelMatch(); |
| 1436 } | 1436 } |
| 1437 | 1437 |
| 1438 } // namespace | 1438 } // namespace |
| 1439 | 1439 |
| 1440 } // namespace browser_sync | 1440 } // namespace browser_sync |
| OLD | NEW |