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/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.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/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
11 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 11 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/sync/profile_sync_service.h" | 13 #include "chrome/browser/sync/profile_sync_service.h" |
14 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 14 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
15 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 15 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
16 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 16 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
17 #include "chrome/browser/sync/test/integration/sync_test.h" | 17 #include "chrome/browser/sync/test/integration/sync_test.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "components/bookmarks/browser/bookmark_model.h" | 19 #include "components/bookmarks/browser/bookmark_model.h" |
20 #include "sync/internal_api/public/util/sync_db_util.h" | 20 #include "sync/internal_api/public/util/sync_db_util.h" |
21 #include "sync/test/fake_server/fake_server_verifier.h" | 21 #include "sync/test/fake_server/fake_server_verifier.h" |
22 #include "sync/util/time.h" | 22 #include "sync/util/time.h" |
23 | 23 |
| 24 using bookmarks::BookmarkNode; |
24 using bookmarks_helper::AddFolder; | 25 using bookmarks_helper::AddFolder; |
25 using bookmarks_helper::AddURL; | 26 using bookmarks_helper::AddURL; |
26 using bookmarks_helper::GetOtherNode; | 27 using bookmarks_helper::GetOtherNode; |
27 using bookmarks_helper::ModelMatchesVerifier; | 28 using bookmarks_helper::ModelMatchesVerifier; |
28 using bookmarks_helper::Move; | 29 using bookmarks_helper::Move; |
29 using bookmarks_helper::Remove; | 30 using bookmarks_helper::Remove; |
30 using sync_integration_test_util::AwaitCommitActivityCompletion; | 31 using sync_integration_test_util::AwaitCommitActivityCompletion; |
31 | 32 |
32 namespace { | 33 namespace { |
33 const char kUrl1[] = "http://www.google.com"; | 34 const char kUrl1[] = "http://www.google.com"; |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 ASSERT_TRUE(rollback_checker.Wait()); | 433 ASSERT_TRUE(rollback_checker.Wait()); |
433 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0)); | 434 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0)); |
434 ASSERT_TRUE(shutdown_checker.Wait()); | 435 ASSERT_TRUE(shutdown_checker.Wait()); |
435 | 436 |
436 // Verify bookmarks are unchanged. | 437 // Verify bookmarks are unchanged. |
437 ASSERT_EQ(3, sub_folder->child_count()); | 438 ASSERT_EQ(3, sub_folder->child_count()); |
438 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url()); | 439 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url()); |
439 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url()); | 440 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url()); |
440 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url()); | 441 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url()); |
441 } | 442 } |
OLD | NEW |