Skip to content

GitLab

T
tangled
Commit 7c0b3512 authored by Hongchan Choi's avatar Hongchan Choi Committed by Commit Bot
Browse files
Options

Revert "Followup cleanup for ProfileSyncServiceUsesTaskScheduler experiment code." 

This reverts commit ded13f7d.

Reason for revert: Build Failure (Tree Closer)

Original change's description:
> Followup cleanup for ProfileSyncServiceUsesTaskScheduler experiment code.
> 
> 1) Remove sync_thread_ from the ProfileSyncService interface to avoid
> accidental use.
> 2) Enable experiment in tests to provide coverage.
> 3) Add some ScopedAllowBaseSyncPrimitives in code that needed it.
> 
> Bug: 1014464
> Change-Id: I79393edac048a2960b4f2bc7593be326f5d27419
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895797
> Commit-Queue: Oliver Li <olivierli@chromium.org>
> Reviewed-by: François Doray <fdoray@chromium.org>
> Reviewed-by: Mikel Astiz <mastiz@chromium.org>
> Auto-Submit: Oliver Li <olivierli@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#713459}

TBR=fdoray@chromium.org,mastiz@chromium.org,olivierli@chromium.org

Change-Id: I40c10c06af767261b7e8173db77d8a5b6224e297
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1014464
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1903833Reviewed-by: default avatarHongchan Choi <hongchan@chromium.org>
Commit-Queue: Hongchan Choi <hongchan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713465}
parent b2af1539
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 190 deletions
base/threading/thread_restrictions.h
View file @ 7c0b3512
......@@ -211,9 +211,6 @@ class PrinterQuery;
namespace rlz_lib {
class FinancialPing;
}
namespace syncer {
class GetLocalChangesRequest;
}
namespace ui {
class CommandBufferClientImpl;
class CommandBufferLocal;
......@@ -421,7 +418,6 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
friend class rlz_lib::FinancialPing;
friend class shell_integration_linux::
LaunchXdgUtilityScopedAllowBaseSyncPrimitives;
friend class syncer::GetLocalChangesRequest;
friend class webrtc::DesktopConfigurationMonitor;
// Usage that should be fixed:
......
chrome/browser/sync/test/integration/enable_disable_test.cc
View file @ 7c0b3512
......@@ -11,7 +11,6 @@
#include "base/test/metrics/histogram_tester.h"
#include "base/values.h"
#include "chrome/browser/sync/test/integration/bookmarks_helper.h"
#include "chrome/browser/sync/test/integration/feature_toggler.h"
#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"
......@@ -75,11 +74,9 @@ ModelTypeSet MultiGroupTypes(const ModelTypeSet& registered_types) {
// This test enables and disables types and verifies the type is sufficiently
// affected by checking for existence of a root node.
class EnableDisableSingleClientTest : public FeatureToggler, public SyncTest {
class EnableDisableSingleClientTest : public SyncTest {
public:
EnableDisableSingleClientTest()
: FeatureToggler(switches::kProfileSyncServiceUsesThreadPool),
SyncTest(SINGLE_CLIENT) {}
EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT) {}
~EnableDisableSingleClientTest() override {}
// Don't use self-notifications as they can trigger additional sync cycles.
......@@ -170,7 +167,7 @@ class EnableDisableSingleClientTest : public FeatureToggler, public SyncTest {
DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
};
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, EnableOneAtATime) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
// Setup sync with no enabled types.
SetupTest(/*all_types_enabled=*/false);
......@@ -205,7 +202,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, EnableOneAtATime) {
}
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, DisableOneAtATime) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
// Setup sync with no disabled types.
SetupTest(/*all_types_enabled=*/true);
......@@ -241,7 +238,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, DisableOneAtATime) {
}
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
FastEnableDisableOneAtATime) {
// Setup sync with no enabled types.
SetupTest(/*all_types_enabled=*/false);
......@@ -273,7 +270,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
}
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
FastDisableEnableOneAtATime) {
// Setup sync with no disabled types.
SetupTest(/*all_types_enabled=*/true);
......@@ -297,7 +294,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
}
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
FastEnableDisableEnableOneAtATime) {
// Setup sync with no enabled types.
SetupTest(/*all_types_enabled=*/false);
......@@ -323,7 +320,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
}
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, EnableDisable) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableDisable) {
SetupTest(/*all_types_enabled=*/false);
// Enable all, and then disable immediately afterwards, before datatypes
......@@ -340,11 +337,11 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, EnableDisable) {
}
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, PRE_EnableAndRestart) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, PRE_EnableAndRestart) {
SetupTest(/*all_types_enabled=*/true);
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, EnableAndRestart) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableAndRestart) {
ASSERT_TRUE(SetupClients());
EXPECT_TRUE(GetClient(0)->AwaitEngineInitialization());
......@@ -357,7 +354,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, EnableAndRestart) {
}
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, FastEnableDisableEnable) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, FastEnableDisableEnable) {
SetupTest(/*all_types_enabled=*/false);
// Enable all, and then disable+reenable immediately afterwards, before
......@@ -379,7 +376,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, FastEnableDisableEnable) {
// redownloaded when Sync is started again. This does not actually verify that
// the data is gone from disk (which seems infeasible); it's mostly here as a
// baseline for the following tests.
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
RedownloadsAfterClearData) {
ASSERT_TRUE(SetupClients());
ASSERT_FALSE(bookmarks_helper::GetBookmarkModel(0)->IsBookmarked(
......@@ -409,7 +406,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
EXPECT_EQ(GetNumUpdatesDownloadedInLastCycle(), initial_updates_downloaded);
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
DoesNotRedownloadAfterKeepData) {
ASSERT_TRUE(SetupClients());
ASSERT_FALSE(bookmarks_helper::GetBookmarkModel(0)->IsBookmarked(
......@@ -451,7 +448,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
/*REMOTE_INITIAL_UPDATE=*/5));
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, ClearsPrefsIfClearData) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, ClearsPrefsIfClearData) {
SetupTest(/*all_types_enabled=*/true);
SyncPrefs prefs(GetProfile(0)->GetPrefs());
......@@ -461,7 +458,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest, ClearsPrefsIfClearData) {
EXPECT_EQ("", prefs.GetCacheGuid());
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientTest,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
DoesNotClearPrefsWithKeepData) {
SetupTest(/*all_types_enabled=*/true);
......@@ -489,7 +486,7 @@ class EnableDisableSingleClientSelfNotifyTest
}
};
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientSelfNotifyTest,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientSelfNotifyTest,
PRE_ResendsBagOfChips) {
sync_pb::ChipBag bag_of_chips;
bag_of_chips.set_server_chips(kTestServerChips);
......@@ -506,7 +503,7 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientSelfNotifyTest,
EXPECT_EQ(kTestServerChips, message.bag_of_chips().server_chips());
}
IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientSelfNotifyTest,
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientSelfNotifyTest,
ResendsBagOfChips) {
ASSERT_TRUE(SetupClients());
SyncPrefs prefs(GetProfile(0)->GetPrefs());
......@@ -518,8 +515,4 @@ IN_PROC_BROWSER_TEST_P(EnableDisableSingleClientSelfNotifyTest,
EXPECT_EQ(kTestServerChips, message.bag_of_chips().server_chips());
}
INSTANTIATE_TEST_SUITE_P(,
EnableDisableSingleClientSelfNotifyTest,
::testing::Values(false, true));
} // namespace
chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
View file @ 7c0b3512
......@@ -10,7 +10,6 @@
#include "base/test/metrics/histogram_tester.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/test/integration/bookmarks_helper.h"
#include "chrome/browser/sync/test/integration/feature_toggler.h"
#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
#include "chrome/browser/sync/test/integration/sync_test.h"
......@@ -63,11 +62,9 @@ const int kSingleProfileIndex = 0;
// fake server across PRE_MyTest and MyTest.
const char kBookmarkGuid[] = "e397ed62-9532-4dbf-ae55-200236eba15c";
class SingleClientBookmarksSyncTest : public FeatureToggler, public SyncTest {
class SingleClientBookmarksSyncTest : public SyncTest {
public:
SingleClientBookmarksSyncTest()
: FeatureToggler(switches::kProfileSyncServiceUsesThreadPool),
SyncTest(SINGLE_CLIENT) {}
SingleClientBookmarksSyncTest() : SyncTest(SINGLE_CLIENT) {}
~SingleClientBookmarksSyncTest() override {}
// Verify that the local bookmark model (for the Profile corresponding to
......@@ -96,7 +93,7 @@ void SingleClientBookmarksSyncTest::VerifyBookmarkModelMatchesFakeServer(
}
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, Sanity) {
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, Sanity) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
// Starting state:
......@@ -230,7 +227,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, Sanity) {
VerifyBookmarkModelMatchesFakeServer(kSingleProfileIndex);
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, CommitLocalCreations) {
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, CommitLocalCreations) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
// Starting state:
......@@ -271,7 +268,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, CommitLocalCreations) {
EXPECT_TRUE(ModelMatchesVerifier(kSingleProfileIndex));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, InjectedBookmark) {
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, InjectedBookmark) {
std::string title = "Montreal Canadiens";
fake_server::EntityBuilderFactory entity_builder_factory;
fake_server::BookmarkEntityBuilder bookmark_builder =
......@@ -289,7 +286,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, InjectedBookmark) {
// Test that a client doesn't mutate the favicon data in the process
// of storing the favicon data from sync to the database or in the process
// of requesting data from the database for sync.
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
SetFaviconHiDPIDifferentCodec) {
// Set the supported scale factors to 1x and 2x such that
// BookmarkModel::GetFavicon() requests both 1x and 2x.
......@@ -334,7 +331,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
// Test that a client deletes favicons from sync when they have been removed
// from the local database.
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, DeleteFaviconFromSync) {
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, DeleteFaviconFromSync) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(ModelMatchesVerifier(kSingleProfileIndex));
......@@ -360,7 +357,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, DeleteFaviconFromSync) {
GetBookmarkModel(kSingleProfileIndex)->GetFavicon(bookmark).IsEmpty());
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
BookmarkAllNodesRemovedEvent) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
// Starting state:
......@@ -421,7 +418,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
ASSERT_TRUE(ModelMatchesVerifier(kSingleProfileIndex));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, DownloadDeletedBookmark) {
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, DownloadDeletedBookmark) {
std::string title = "Patrick Star";
fake_server::EntityBuilderFactory entity_builder_factory;
fake_server::BookmarkEntityBuilder bookmark_builder =
......@@ -448,7 +445,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, DownloadDeletedBookmark) {
.Wait());
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
DownloadModifiedBookmark) {
std::string title = "Syrup";
GURL original_url = GURL("https://en.wikipedia.org/?title=Maple_syrup");
......@@ -484,7 +481,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
ASSERT_EQ(1u, CountBookmarksWithTitlesMatching(kSingleProfileIndex, title));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, DownloadBookmarkFolder) {
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, DownloadBookmarkFolder) {
const std::string title = "Seattle Sounders FC";
fake_server::EntityBuilderFactory entity_builder_factory;
fake_server::BookmarkEntityBuilder bookmark_builder =
......@@ -500,7 +497,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, DownloadBookmarkFolder) {
ASSERT_EQ(1u, CountFoldersWithTitlesMatching(kSingleProfileIndex, title));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
DownloadLegacyBookmarkFolder) {
const std::string title = "Seattle Sounders FC";
fake_server::EntityBuilderFactory entity_builder_factory;
......@@ -521,7 +518,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
// before committing them because historically they were illegal server titles.
// This test makes sure that this functionality is implemented for backward
// compatibility with legacy clients.
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ShouldCommitBookmarksWithIllegalServerNames) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
......@@ -556,7 +553,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
// commit because historically they were considered illegal server titles. This
// test makes sure that this functionality is implemented for backward
// compatibility with legacy clients.
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ShouldCreateLocalBookmarksWithIllegalServerNames) {
const std::vector<std::string> illegal_titles = {"", ".", ".."};
......@@ -584,7 +581,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
// Legacy bookmark clients append a blank space to empty titles. This tests that
// this is respected when merging local and remote hierarchies.
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ShouldTruncateBlanksWhenMatchingTitles) {
const std::string remote_blank_title = " ";
const std::string local_empty_title = "";
......@@ -619,7 +616,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
// Legacy bookmark clients truncate long titles up to 255 bytes. This tests that
// this is respected when merging local and remote hierarchies.
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ShouldTruncateLongTitles) {
const std::string remote_truncated_title =
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrst"
......@@ -659,7 +656,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
remote_truncated_title));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
DownloadBookmarkFoldersWithPositions) {
const std::string title0 = "Folder left";
const std::string title1 = "Folder middle";
......@@ -699,11 +696,11 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
EXPECT_EQ(base::ASCIIToUTF16(title2), bar->children()[2]->GetTitle());
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, E2E_ONLY(SanitySetup)) {
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, E2E_ONLY(SanitySetup)) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
}
IN_PROC_BROWSER_TEST_P(
IN_PROC_BROWSER_TEST_F(
SingleClientBookmarksSyncTest,
RemoveRightAfterAddShouldNotSendCommitRequestsOrTombstones) {
base::HistogramTester histogram_tester;
......@@ -734,7 +731,7 @@ IN_PROC_BROWSER_TEST_P(
/*LOCAL_DELETION=*/0));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
PRE_PersistProgressMarkerOnRestart) {
const std::string title = "Seattle Sounders FC";
fake_server::EntityBuilderFactory entity_builder_factory;
......@@ -753,7 +750,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
/*REMOTE_INITIAL_UPDATE=*/5));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
PersistProgressMarkerOnRestart) {
const std::string title = "Seattle Sounders FC";
fake_server::EntityBuilderFactory entity_builder_factory;
......@@ -785,7 +782,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
/*REMOTE_INITIAL_UPDATE=*/5));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ApplyRemoteCreationWithValidGUID) {
// Start syncing.
DisableVerifier();
......@@ -813,7 +810,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
GetBookmarkBarNode(kSingleProfileIndex)->children()[0].get()->guid());
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ApplyRemoteCreationWithoutValidGUID) {
// Start syncing.
DisableVerifier();
......@@ -847,7 +844,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
GetBookmarkBarNode(kSingleProfileIndex)->children()[0].get()->guid());
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ApplyRemoteCreationWithoutValidGUIDOrOCII) {
// Start syncing.
DisableVerifier();
......@@ -878,7 +875,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
originator_client_item_id));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
MergeRemoteCreationWithValidGUID) {
const GURL url = GURL("http://www.foo.com");
fake_server::EntityBuilderFactory entity_builder_factory;
......@@ -904,7 +901,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
EXPECT_TRUE(ContainsBookmarkNodeWithGUID(kSingleProfileIndex, guid));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
MergeRemoteCreationWithoutValidGUID) {
const GURL url = GURL("http://www.foo.com");
const std::string originator_client_item_id = base::GenerateGUID();
......@@ -934,7 +931,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
originator_client_item_id));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
MergeRemoteCreationWithoutValidGUIDOrOCII) {
const GURL url = GURL("http://www.foo.com");
const std::string originator_client_item_id = "INVALID OCII";
......@@ -965,7 +962,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
originator_client_item_id));
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ApplyRemoteUpdateWithValidGUID) {
// Create a bookmark.
const GURL url = GURL("https://foo.com");
......@@ -1011,7 +1008,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
GetBookmarkBarNode(kSingleProfileIndex)->children()[0].get()->guid());
}
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
MergeRemoteUpdateWithValidGUID) {
DisableVerifier();
ASSERT_TRUE(SetupClients());
......@@ -1044,7 +1041,4 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
EXPECT_EQ(1u, GetBookmarkBarNode(kSingleProfileIndex)->children().size());
}
INSTANTIATE_TEST_SUITE_P(,
SingleClientBookmarksSyncTest,
::testing::Values(false, true));
} // namespace
chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
View file @ 7c0b3512
......@@ -16,7 +16,6 @@
#include "chrome/browser/policy/profile_policy_connector_builder.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/test/integration/bookmarks_helper.h"
#include "chrome/browser/sync/test/integration/feature_toggler.h"
#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
#include "chrome/browser/sync/test/integration/sync_test.h"
......@@ -82,11 +81,9 @@ const char kGenericFolderName[] = "Folder Name";
const char kGenericSubfolderName[] = "Subfolder Name";
const char kValidPassphrase[] = "passphrase!";
class TwoClientBookmarksSyncTest : public FeatureToggler, public SyncTest {
class TwoClientBookmarksSyncTest : public SyncTest {
public:
TwoClientBookmarksSyncTest()
: FeatureToggler(switches::kProfileSyncServiceUsesThreadPool),
SyncTest(TWO_CLIENT) {}
TwoClientBookmarksSyncTest() : SyncTest(TWO_CLIENT) {}
~TwoClientBookmarksSyncTest() override {}
void TearDownInProcessBrowserTestFixture() override {
......@@ -102,7 +99,7 @@ class TwoClientBookmarksSyncTest : public FeatureToggler, public SyncTest {
DISALLOW_COPY_AND_ASSIGN(TwoClientBookmarksSyncTest);
};
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, Sanity) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, Sanity) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -132,7 +129,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, Sanity) {
ASSERT_TRUE(BookmarksMatchChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SimultaneousURLChanges) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SimultaneousURLChanges) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -153,7 +150,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SimultaneousURLChanges) {
ASSERT_TRUE(BookmarksMatchChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddFirstFolder) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddFirstFolder) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -161,7 +158,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddFirstFolder) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_Add3FoldersInShuffledOrder) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -172,7 +169,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_AddFirstBMWithoutFavicon) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -181,7 +178,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddFirstBMWithFavicon) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddFirstBMWithFavicon) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
const GURL page_url(kGenericURL);
......@@ -200,7 +197,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddFirstBMWithFavicon) {
// In particular, the synced 16x16 favicon bitmap should overwrite 16x16
// favicon bitmaps on all clients. (Though non-16x16 favicon bitmaps
// are unchanged).
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_SetFaviconHiDPI) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_SetFaviconHiDPI) {
// Set the supported scale factors to include 2x such that CreateFavicon()
// creates a favicon with hidpi representations and that methods in the
// FaviconService request hidpi favicons.
......@@ -239,7 +236,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_SetFaviconHiDPI) {
// favicon should be redownloaded when the web when the bookmark is visited.
// If sync prevents the "last updated time" from expiring, the favicon is
// never redownloaded from the web. (http://crbug.com/481414)
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_UpdatingTitleDoesNotUpdateFaviconLastUpdatedTime) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
......@@ -285,7 +282,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
// ensures that sync has the most up to date data and prevents sync from
// reverting the newly updated bookmark favicon back to the old favicon.
// crbug.com/485657
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_SetFaviconTwoBookmarksSameIconURL) {
const GURL page_url1("http://www.google.com/a");
const GURL page_url2("http://www.google.com/b");
......@@ -318,7 +315,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_DeleteFavicon) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_DeleteFavicon) {
const GURL page_url("http://www.google.com/a");
const GURL icon_url("http://www.google.com/favicon.ico");
......@@ -347,7 +344,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_DeleteFavicon) {
CheckHasNoFavicon(0, page_url);
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddNonHTTPBMs) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddNonHTTPBMs) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -357,7 +354,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddNonHTTPBMs) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddFirstBMUnderFolder) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddFirstBMUnderFolder) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -367,7 +364,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddFirstBMUnderFolder) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_AddSeveralBMsUnderBMBarAndOtherBM) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -381,7 +378,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddSeveralBMsAndFolders) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddSeveralBMsAndFolders) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -411,7 +408,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_AddSeveralBMsAndFolders) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DuplicateBMWithDifferentURLSameName) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -424,7 +421,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Add bookmarks with different name and same URL.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DuplicateBookmarksWithSameURL) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -436,7 +433,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameBMName) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameBMName) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -450,7 +447,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameBMName) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameBMURL) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameBMURL) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -465,7 +462,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameBMURL) {
}
// Renaming the same bookmark name twice.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_TwiceRenamingBookmarkName) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -484,7 +481,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Renaming the same bookmark URL twice.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_TwiceRenamingBookmarkURL) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -502,7 +499,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameBMFolder) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameBMFolder) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -516,7 +513,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameBMFolder) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameEmptyBMFolder) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameEmptyBMFolder) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -529,7 +526,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameEmptyBMFolder) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_RenameBMFolderWithLongHierarchy) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -554,7 +551,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_RenameBMFolderThatHasParentAndChildren) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -585,7 +582,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameBMNameAndURL) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameBMNameAndURL) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -603,7 +600,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_RenameBMNameAndURL) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DeleteBMEmptyAccountAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -615,7 +612,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMNonEmptyAccountAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -631,7 +628,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelFirstBMUnderBMFoldNonEmptyFoldAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -649,7 +646,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelLastBMUnderBMFoldNonEmptyFoldAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -667,7 +664,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelMiddleBMUnderBMFoldNonEmptyFoldAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -685,7 +682,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMsUnderBMFoldEmptyFolderAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -704,7 +701,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelEmptyBMFoldEmptyAccountAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -716,7 +713,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelEmptyBMFoldNonEmptyAccountAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -738,7 +735,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMFoldWithBMsNonEmptyAccountAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -767,7 +764,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMFoldWithBMsAndBMFoldsNonEmptyACAfterwards) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -815,7 +812,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMFoldWithParentAndChildrenBMsAndBMFolds) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -846,7 +843,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_ReverseTheOrderOfTwoBMs) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_ReverseTheOrderOfTwoBMs) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -864,7 +861,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_ReverseTheOrderOfTwoBMs) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_ReverseTheOrderOf10BMs) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_ReverseTheOrderOf10BMs) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -879,7 +876,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_ReverseTheOrderOf10BMs) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_MovingBMsFromBMBarToBMFolder) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -902,7 +899,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_MovingBMsFromBMFoldToBMBar) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -925,7 +922,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_MovingBMsFromParentBMFoldToChildBMFold) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -954,7 +951,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_MovingBMsFromChildBMFoldToParentBMFold) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -983,7 +980,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_HoistBMs10LevelUp) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_HoistBMs10LevelUp) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1021,7 +1018,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_HoistBMs10LevelUp) {
}
// Flaky. http://crbug.com/107744.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_SinkBMs10LevelDown) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_SinkBMs10LevelDown) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1058,7 +1055,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_SinkBMs10LevelDown) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_SinkEmptyBMFold5LevelsDown) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1086,7 +1083,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_SinkNonEmptyBMFold5LevelsDown) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1119,7 +1116,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_HoistFolder5LevelsUp) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_HoistFolder5LevelsUp) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1152,7 +1149,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, SC_HoistFolder5LevelsUp) {
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_ReverseTheOrderOfTwoBMFolders) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1173,7 +1170,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_ReverseTheOrderOfTenBMFolders) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1194,7 +1191,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchVerifierChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BiDirectionalPushAddingBM) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1212,7 +1209,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BiDirectionalPush_AddingSameBMs) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1229,14 +1226,14 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_TRUE(BookmarksMatchChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BootStrapEmptyStateEverywhere) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(AllModelsMatchVerifier());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_CaseInsensitivity_InNames) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1259,7 +1256,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_SimpleMergeOfDifferentBMModels) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1286,7 +1283,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeSimpleBMHierarchyUnderBMBar) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1310,7 +1307,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeSimpleBMHierarchyEqualSetsUnderBMBar) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1330,7 +1327,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Merge bookmark folders with different bookmarks.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeBMFoldersWithDifferentBMs) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1354,7 +1351,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Merge moderately complex bookmark models.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeDifferentBMModelsModeratelyComplex) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1397,7 +1394,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Merge simple bookmark subset under bookmark folder.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeSimpleBMHierarchySubsetUnderBMFolder) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1423,7 +1420,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Merge subsets of bookmark under bookmark bar.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeSimpleBMHierarchySubsetUnderBookmarkBar) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1448,7 +1445,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Merge simple bookmark hierarchy under bookmark folder.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_SimpleBMHierarchy_Under_BMFolder) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1480,7 +1477,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
// Merge disjoint sets of bookmark hierarchy under bookmark
// folder.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_SimpleBMHierarchy_DisjointSets_Under_BMFolder) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1510,7 +1507,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Merge disjoint sets of bookmark hierarchy under bookmark bar.
IN_PROC_BROWSER_TEST_P(
IN_PROC_BROWSER_TEST_F(
TwoClientBookmarksSyncTest,
MC_Merge_SimpleBMHierarchy_DisjointSets_Under_BookmarkBar) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
......@@ -1534,7 +1531,7 @@ IN_PROC_BROWSER_TEST_P(
}
// Merge sets of duplicate bookmarks under bookmark bar.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_SimpleBMHierarchy_DuplicateBMs_Under_BMBar) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1565,7 +1562,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, DisableBookmarks) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, DisableBookmarks) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1580,7 +1577,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, DisableBookmarks) {
ASSERT_TRUE(BookmarksMatchChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, DisableSync) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, DisableSync) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1597,7 +1594,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, DisableSync) {
}
// Test adding duplicate folder - Both with different BMs underneath.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, MC_DuplicateFolders) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DuplicateFolders) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1619,7 +1616,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, MC_DuplicateFolders) {
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(
GetClient(1)->DisableSyncForType(syncer::UserSelectableType::kBookmarks));
......@@ -1655,7 +1652,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {
// Test a scenario of updating the name of the same bookmark from two clients at
// the same time.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BookmarkNameChangeConflict) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
......@@ -1680,7 +1677,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
// Test a scenario of updating the URL of the same bookmark from two clients at
// the same time.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BookmarkURLChangeConflict) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
......@@ -1707,7 +1704,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
// Test a scenario of updating the BM Folder name from two clients at the same
// time.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_FolderNameChangeConflict) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier();
......@@ -1782,7 +1779,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
FirstClientEnablesEncryptionWithPassSecondChanges) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1824,7 +1821,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
// Deliberately racy rearranging of bookmarks to test that our conflict resolver
// code results in a consistent view across machines (no matter what the final
// order is).
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, RacyPositionChanges) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, RacyPositionChanges) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1883,7 +1880,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, RacyPositionChanges) {
// Trigger the server side creation of Synced Bookmarks. Ensure both clients
// remain syncing afterwards. Add bookmarks to the synced bookmarks folder
// and ensure both clients receive the bookmark.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, CreateSyncedBookmarks) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, CreateSyncedBookmarks) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1906,7 +1903,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, CreateSyncedBookmarks) {
ASSERT_TRUE(BookmarksMatchChecker().Wait());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
BookmarkAllNodesRemovedEvent) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
......@@ -1960,7 +1957,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// Verifies that managed bookmarks (installed by policy) don't get synced.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, ManagedBookmarks) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, ManagedBookmarks) {
// Make sure the first Profile has an overridden policy provider.
EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_))
.WillRepeatedly(testing::Return(true));
......@@ -2026,12 +2023,12 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, ManagedBookmarks) {
ASSERT_EQ(0u, managed_node1->children().size());
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest, E2E_ONLY(SanitySetup)) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, E2E_ONLY(SanitySetup)) {
ResetSyncForPrimaryAccount();
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
E2E_ONLY(OneClientAddsBookmark)) {
ResetSyncForPrimaryAccount();
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
......@@ -2057,7 +2054,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
// TODO(shadi): crbug.com/569213: Enable this as E2E test.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
OneClientAddsFolderAndBookmark) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
// All profiles should sync same bookmarks.
......@@ -2082,7 +2079,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
}
}
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
E2E_ONLY(TwoClientsAddBookmarks)) {
ResetSyncForPrimaryAccount();
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
......@@ -2113,7 +2110,7 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
// Verify that a bookmark added on a client with bookmark syncing disabled gets
// synced to a second client once bookmark syncing is re-enabled.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
E2E_ENABLED(AddBookmarkWhileDisabled)) {
ResetSyncForPrimaryAccount();
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
......@@ -2145,8 +2142,4 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTest,
ASSERT_EQ(initial_count + 2, CountAllBookmarks(1));
}
INSTANTIATE_TEST_SUITE_P(,
TwoClientBookmarksSyncTest,
::testing::Values(false, true));
} // namespace
components/sync/driver/profile_sync_service.cc
View file @ 7c0b3512
......@@ -17,7 +17,6 @@
#include "base/run_loop.h"
#include "base/strings/strcat.h"
#include "base/task/post_task.h"
#include "base/threading/thread.h"
#include "components/invalidation/public/invalidation_service.h"
#include "components/signin/public/base/signin_metrics.h"
#include "components/signin/public/identity_manager/account_info.h"
......@@ -52,6 +51,9 @@ namespace syncer {
namespace {
const base::Feature kProfileSyncServiceUsesTaskScheduler{
"ProfileSyncServiceUsesThreadPool", base::FEATURE_DISABLED_BY_DEFAULT};
// The initial state of sync, for the Sync.InitialState histogram. Even if
// this value is CAN_START, sync startup might fail for reasons that we may
// want to consider logging in the future, such as a passphrase needed for
......@@ -433,28 +435,18 @@ void ProfileSyncService::InitializeBackendTaskRunnerIfNeeded() {
return;
}
if (base::FeatureList::IsEnabled(
switches::kProfileSyncServiceUsesThreadPool)) {
if (base::FeatureList::IsEnabled(kProfileSyncServiceUsesTaskScheduler)) {
backend_task_runner_ = base::CreateSequencedTaskRunner(
{base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_VISIBLE,
base::TaskShutdownBehavior::BLOCK_SHUTDOWN});
} else {
// The thread where all the sync operations happen. This thread is kept
// alive until browser shutdown and reused if sync is turned off and on
// again. It is joined during the shutdown process, but there is an abort
// mechanism in place to prevent slow HTTP requests from blocking browser
// shutdown.
auto sync_thread = std::make_unique<base::Thread>("Chrome_SyncThread");
sync_thread_ = std::make_unique<base::Thread>("Chrome_SyncThread");
base::Thread::Options options;
options.timer_slack = base::TIMER_SLACK_MAXIMUM;
bool success = sync_thread->StartWithOptions(options);
bool success = sync_thread_->StartWithOptions(options);
DCHECK(success);
backend_task_runner_ = sync_thread->task_runner();
// Transfer ownership of the thread to the stopper closure that gets
// executed at shutdown.
sync_thread_stopper_ =
base::BindOnce(&base::Thread::Stop, std::move(sync_thread));
backend_task_runner_ = sync_thread_->task_runner();
}
}
......@@ -544,9 +536,8 @@ void ProfileSyncService::Shutdown() {
auth_manager_.reset();
if (sync_thread_stopper_) {
std::move(sync_thread_stopper_).Run();
}
if (sync_thread_)
sync_thread_->Stop();
}
void ProfileSyncService::ShutdownImpl(ShutdownReason reason) {
......
components/sync/driver/profile_sync_service.h
View file @ 7c0b3512
......@@ -400,10 +400,13 @@ class ProfileSyncService : public SyncService,
// A utility object containing logic and state relating to encryption.
SyncServiceCrypto crypto_;
// Owns the sync thread and takes care of its destruction.
// The thread where all the sync operations happen. This thread is kept alive
// until browser shutdown and reused if sync is turned off and on again. It is
// joined during the shutdown process, but there is an abort mechanism in
// place to prevent slow HTTP requests from blocking browser shutdown.
// TODO(https://crbug.com/1014464): Remove once we have switched to
// Threadpool.
base::OnceClosure sync_thread_stopper_;
std::unique_ptr<base::Thread> sync_thread_;
// TODO(crbug.com/923287): Move out of this class. Possibly to SyncEngineImpl.
scoped_refptr<base::SequencedTaskRunner> backend_task_runner_;
......
components/sync/driver/sync_driver_switches.cc
View file @ 7c0b3512
......@@ -76,8 +76,4 @@ const base::Feature kMergeBookmarksUsingGUIDs{
const base::Feature kSyncDeviceInfoInTransportMode{
"SyncDeviceInfoInTransportMode", base::FEATURE_DISABLED_BY_DEFAULT};
// Enables the running of backend ProfileSyncService tasks on the ThreadPool.
const base::Feature kProfileSyncServiceUsesThreadPool{
"ProfileSyncServiceUsesThreadPool", base::FEATURE_DISABLED_BY_DEFAULT};
} // namespace switches
components/sync/driver/sync_driver_switches.h
View file @ 7c0b3512
......@@ -35,7 +35,6 @@ extern const base::Feature kSyncWifiConfigurations;
extern const base::Feature kUpdateBookmarkGUIDWithNodeReplacement;
extern const base::Feature kMergeBookmarksUsingGUIDs;
extern const base::Feature kSyncDeviceInfoInTransportMode;
extern const base::Feature kProfileSyncServiceUsesThreadPool;
} // namespace switches
......
components/sync/engine_impl/model_type_worker.cc
View file @ 7c0b3512
......@@ -18,7 +18,6 @@
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread_restrictions.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "components/sync/base/cancelation_signal.h"
#include "components/sync/base/client_tag_hash.h"
......@@ -790,12 +789,7 @@ void GetLocalChangesRequest::WaitForResponse() {
if (!cancelation_signal_->TryRegisterHandler(this)) {
return;
}
{
base::ScopedAllowBaseSyncPrimitives allow_wait;
response_accepted_.Wait();
}
response_accepted_.Wait();
cancelation_signal_->UnregisterHandler(this);
}
......
components/sync/test/fake_server/fake_server_http_post_provider.cc
View file @ 7c0b3512
......@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/threading/thread_restrictions.h"
#include "base/time/time.h"
#include "components/sync/test/fake_server/fake_server.h"
#include "net/base/net_errors.h"
......@@ -108,10 +107,7 @@ bool FakeServerHttpPostProvider::MakeSynchronousPost(int* net_error_code,
return false;
}
{
base::ScopedAllowBaseSyncPrimitivesForTesting allow_wait;
synchronous_post_completion_.Wait();
}
synchronous_post_completion_.Wait();
if (aborted_) {
*net_error_code = net::ERR_ABORTED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment