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/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
17 #include "base/string16.h" | 17 #include "base/string16.h" |
18 #include "base/string_number_conversions.h" | 18 #include "base/string_number_conversions.h" |
19 #include "base/string_util.h" | 19 #include "base/string_util.h" |
20 #include "base/tracked.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/engine/syncapi.h" | 25 #include "chrome/browser/sync/engine/syncapi.h" |
26 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 26 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
27 #include "chrome/browser/sync/glue/bookmark_model_associator.h" | 27 #include "chrome/browser/sync/glue/bookmark_model_associator.h" |
28 #include "chrome/browser/sync/syncable/directory_manager.h" | 28 #include "chrome/browser/sync/syncable/directory_manager.h" |
29 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
| 30 #include "chrome/test/base/testing_browser_process_test.h" |
30 #include "chrome/test/base/testing_profile.h" | 31 #include "chrome/test/base/testing_profile.h" |
31 #include "chrome/test/sync/engine/test_id_factory.h" | 32 #include "chrome/test/sync/engine/test_id_factory.h" |
32 #include "chrome/test/sync/engine/test_user_share.h" | 33 #include "chrome/test/sync/engine/test_user_share.h" |
33 #include "chrome/test/testing_browser_process_test.h" | |
34 #include "content/browser/browser_thread.h" | 34 #include "content/browser/browser_thread.h" |
35 #include "testing/gmock/include/gmock/gmock.h" | 35 #include "testing/gmock/include/gmock/gmock.h" |
36 #include "testing/gtest/include/gtest/gtest.h" | 36 #include "testing/gtest/include/gtest/gtest.h" |
37 | 37 |
38 namespace browser_sync { | 38 namespace browser_sync { |
39 | 39 |
40 namespace { | 40 namespace { |
41 | 41 |
42 using testing::_; | 42 using testing::_; |
43 using testing::InvokeWithoutArgs; | 43 using testing::InvokeWithoutArgs; |
(...skipping 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1427 // Make sure we're back in sync. In real life, the user would need | 1427 // Make sure we're back in sync. In real life, the user would need |
1428 // to reauthenticate before this happens, but in the test, authentication | 1428 // to reauthenticate before this happens, but in the test, authentication |
1429 // is sidestepped. | 1429 // is sidestepped. |
1430 ExpectBookmarkModelMatchesTestData(); | 1430 ExpectBookmarkModelMatchesTestData(); |
1431 ExpectModelMatch(); | 1431 ExpectModelMatch(); |
1432 } | 1432 } |
1433 | 1433 |
1434 } // namespace | 1434 } // namespace |
1435 | 1435 |
1436 } // namespace browser_sync | 1436 } // namespace browser_sync |
OLD | NEW |