| 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/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| 11 #include "base/test/test_timeouts.h" | 11 #include "base/test/test_timeouts.h" |
| 12 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
| 13 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 13 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/sync/profile_sync_service.h" | 15 #include "chrome/browser/sync/profile_sync_service.h" |
| 16 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 16 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| 17 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 17 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
| 18 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 18 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
| 19 #include "chrome/browser/sync/test/integration/sync_test.h" | 19 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 20 #include "chrome/common/chrome_switches.h" | |
| 21 #include "components/bookmarks/browser/bookmark_model.h" | 20 #include "components/bookmarks/browser/bookmark_model.h" |
| 21 #include "components/sync_driver/sync_driver_switches.h" |
| 22 #include "sync/internal_api/public/util/sync_db_util.h" | 22 #include "sync/internal_api/public/util/sync_db_util.h" |
| 23 #include "sync/test/fake_server/fake_server_verifier.h" | 23 #include "sync/test/fake_server/fake_server_verifier.h" |
| 24 #include "sync/util/time.h" | 24 #include "sync/util/time.h" |
| 25 | 25 |
| 26 using bookmarks::BookmarkNode; | 26 using bookmarks::BookmarkNode; |
| 27 using bookmarks_helper::AddFolder; | 27 using bookmarks_helper::AddFolder; |
| 28 using bookmarks_helper::AddURL; | 28 using bookmarks_helper::AddURL; |
| 29 using bookmarks_helper::GetOtherNode; | 29 using bookmarks_helper::GetOtherNode; |
| 30 using bookmarks_helper::ModelMatchesVerifier; | 30 using bookmarks_helper::ModelMatchesVerifier; |
| 31 using bookmarks_helper::Move; | 31 using bookmarks_helper::Move; |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 ASSERT_TRUE(rollback_checker.Wait()); | 431 ASSERT_TRUE(rollback_checker.Wait()); |
| 432 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0)); | 432 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0)); |
| 433 ASSERT_TRUE(shutdown_checker.Wait()); | 433 ASSERT_TRUE(shutdown_checker.Wait()); |
| 434 | 434 |
| 435 // Verify bookmarks are unchanged. | 435 // Verify bookmarks are unchanged. |
| 436 ASSERT_EQ(3, sub_folder->child_count()); | 436 ASSERT_EQ(3, sub_folder->child_count()); |
| 437 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url()); | 437 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url()); |
| 438 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url()); | 438 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url()); |
| 439 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url()); | 439 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url()); |
| 440 } | 440 } |
| OLD | NEW |