OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/files/file_util.h" | 6 #include "base/files/file_util.h" |
7 #include "base/location.h" | 7 #include "base/location.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/prefs/pref_service.h" | |
10 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
11 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
12 #include "base/test/test_timeouts.h" | 11 #include "base/test/test_timeouts.h" |
13 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
14 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 13 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
15 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/sync/chrome_sync_client.h" | 15 #include "chrome/browser/sync/chrome_sync_client.h" |
17 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 16 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
18 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 17 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
19 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 18 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
20 #include "chrome/browser/sync/test/integration/sync_test.h" | 19 #include "chrome/browser/sync/test/integration/sync_test.h" |
21 #include "components/bookmarks/browser/bookmark_model.h" | 20 #include "components/bookmarks/browser/bookmark_model.h" |
22 #include "components/browser_sync/browser/profile_sync_service.h" | 21 #include "components/browser_sync/browser/profile_sync_service.h" |
| 22 #include "components/prefs/pref_service.h" |
23 #include "components/sync_driver/sync_driver_features.h" | 23 #include "components/sync_driver/sync_driver_features.h" |
24 #include "components/sync_driver/sync_driver_switches.h" | 24 #include "components/sync_driver/sync_driver_switches.h" |
25 #include "sync/internal_api/public/util/sync_db_util.h" | 25 #include "sync/internal_api/public/util/sync_db_util.h" |
26 #include "sync/test/fake_server/fake_server_verifier.h" | 26 #include "sync/test/fake_server/fake_server_verifier.h" |
27 #include "sync/util/time.h" | 27 #include "sync/util/time.h" |
28 | 28 |
29 using bookmarks::BookmarkNode; | 29 using bookmarks::BookmarkNode; |
30 using bookmarks_helper::AddFolder; | 30 using bookmarks_helper::AddFolder; |
31 using bookmarks_helper::AddURL; | 31 using bookmarks_helper::AddURL; |
32 using bookmarks_helper::GetOtherNode; | 32 using bookmarks_helper::GetOtherNode; |
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 ASSERT_TRUE(rollback_checker.Wait()); | 442 ASSERT_TRUE(rollback_checker.Wait()); |
443 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0)); | 443 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0)); |
444 ASSERT_TRUE(shutdown_checker.Wait()); | 444 ASSERT_TRUE(shutdown_checker.Wait()); |
445 | 445 |
446 // Verify bookmarks are unchanged. | 446 // Verify bookmarks are unchanged. |
447 ASSERT_EQ(3, sub_folder->child_count()); | 447 ASSERT_EQ(3, sub_folder->child_count()); |
448 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url()); | 448 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url()); |
449 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url()); | 449 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url()); |
450 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url()); | 450 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url()); |
451 } | 451 } |
OLD | NEW |