chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc - Issue 1419103009: [Sync] Componentize ProfileSyncService

Side by Side Diff: chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc

Issue 1419103009: [Sync] Componentize ProfileSyncService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@max_bogue_sync_backend_host

Patch Set: Rebase Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/sync/test/integration/single_client_apps_sync_test.cc ('k') | chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/chrome_sync_client.h"	15 #include "chrome/browser/sync/chrome_sync_client.h"

16 #include "chrome/browser/sync/profile_sync_service.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"

	21 #include "components/browser_sync/browser/profile_sync_service.h"

22 #include "components/sync_driver/sync_driver_switches.h"	22 #include "components/sync_driver/sync_driver_switches.h"

23 #include "sync/internal_api/public/util/sync_db_util.h"	23 #include "sync/internal_api/public/util/sync_db_util.h"

24 #include "sync/test/fake_server/fake_server_verifier.h"	24 #include "sync/test/fake_server/fake_server_verifier.h"

25 #include "sync/util/time.h"	25 #include "sync/util/time.h"

26	26

27 using bookmarks::BookmarkNode;	27 using bookmarks::BookmarkNode;

28 using bookmarks_helper::AddFolder;	28 using bookmarks_helper::AddFolder;

29 using bookmarks_helper::AddURL;	29 using bookmarks_helper::AddURL;

30 using bookmarks_helper::GetOtherNode;	30 using bookmarks_helper::GetOtherNode;

31 using bookmarks_helper::ModelMatchesVerifier;	31 using bookmarks_helper::ModelMatchesVerifier;

(...skipping 403 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
435 ASSERT_TRUE(rollback_checker.Wait());	435 ASSERT_TRUE(rollback_checker.Wait());

436 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));	436 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));

437 ASSERT_TRUE(shutdown_checker.Wait());	437 ASSERT_TRUE(shutdown_checker.Wait());

438	438

439 // Verify bookmarks are unchanged.	439 // Verify bookmarks are unchanged.

440 ASSERT_EQ(3, sub_folder->child_count());	440 ASSERT_EQ(3, sub_folder->child_count());

441 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url());	441 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url());

442 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url());	442 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url());

443 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url());	443 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url());

444 }	444 }

OLD	NEW