Commit 30e0fabc authored by Alexey Baskakov's avatar Alexey Baskakov Committed by Commit Bot

WebApp: Rename single_client_apps_sync_test.cc file.

Rename single_client_apps_sync_test.cc to
single_client_extension_apps_sync_test.cc to be consistent with
two_client_extension_apps_sync_test.cc.

Bug: 1025156
Change-Id: I634d72d920cdd42d1c8dd3b9fe8bfda588ac5a31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2103732
Auto-Submit: Alexey Baskakov <loyso@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750499}
parent 70940462
...@@ -20,11 +20,11 @@ using apps_helper::AllProfilesHaveSameApps; ...@@ -20,11 +20,11 @@ using apps_helper::AllProfilesHaveSameApps;
using apps_helper::InstallHostedApp; using apps_helper::InstallHostedApp;
using apps_helper::InstallPlatformApp; using apps_helper::InstallPlatformApp;
class SingleClientAppsSyncTest class SingleClientExtensionAppsSyncTest
: public SyncTest, : public SyncTest,
public ::testing::WithParamInterface<web_app::ProviderType> { public ::testing::WithParamInterface<web_app::ProviderType> {
public: public:
SingleClientAppsSyncTest() : SyncTest(SINGLE_CLIENT) { SingleClientExtensionAppsSyncTest() : SyncTest(SINGLE_CLIENT) {
switch (GetParam()) { switch (GetParam()) {
case web_app::ProviderType::kWebApps: case web_app::ProviderType::kWebApps:
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
...@@ -37,12 +37,12 @@ class SingleClientAppsSyncTest ...@@ -37,12 +37,12 @@ class SingleClientAppsSyncTest
} }
} }
~SingleClientAppsSyncTest() override = default; ~SingleClientExtensionAppsSyncTest() override = default;
private: private:
base::test::ScopedFeatureList scoped_feature_list_; base::test::ScopedFeatureList scoped_feature_list_;
DISALLOW_COPY_AND_ASSIGN(SingleClientAppsSyncTest); DISALLOW_COPY_AND_ASSIGN(SingleClientExtensionAppsSyncTest);
}; };
// crbug.com/1001437 // crbug.com/1001437
...@@ -54,12 +54,13 @@ class SingleClientAppsSyncTest ...@@ -54,12 +54,13 @@ class SingleClientAppsSyncTest
#define MAYBE_InstallSomeApps InstallSomeApps #define MAYBE_InstallSomeApps InstallSomeApps
#endif #endif
IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, StartWithNoApps) { IN_PROC_BROWSER_TEST_P(SingleClientExtensionAppsSyncTest, StartWithNoApps) {
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, StartWithSomeLegacyApps) { IN_PROC_BROWSER_TEST_P(SingleClientExtensionAppsSyncTest,
StartWithSomeLegacyApps) {
ASSERT_TRUE(SetupClients()); ASSERT_TRUE(SetupClients());
const int kNumApps = 5; const int kNumApps = 5;
...@@ -72,7 +73,8 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, StartWithSomeLegacyApps) { ...@@ -72,7 +73,8 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, StartWithSomeLegacyApps) {
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, StartWithSomePlatformApps) { IN_PROC_BROWSER_TEST_P(SingleClientExtensionAppsSyncTest,
StartWithSomePlatformApps) {
ASSERT_TRUE(SetupClients()); ASSERT_TRUE(SetupClients());
const int kNumApps = 5; const int kNumApps = 5;
...@@ -85,7 +87,8 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, StartWithSomePlatformApps) { ...@@ -85,7 +87,8 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, StartWithSomePlatformApps) {
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, InstallSomeLegacyApps) { IN_PROC_BROWSER_TEST_P(SingleClientExtensionAppsSyncTest,
InstallSomeLegacyApps) {
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
const int kNumApps = 5; const int kNumApps = 5;
...@@ -98,7 +101,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, InstallSomeLegacyApps) { ...@@ -98,7 +101,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, InstallSomeLegacyApps) {
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, IN_PROC_BROWSER_TEST_P(SingleClientExtensionAppsSyncTest,
MAYBE_InstallSomePlatformApps) { MAYBE_InstallSomePlatformApps) {
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
...@@ -112,7 +115,8 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, ...@@ -112,7 +115,8 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest,
ASSERT_TRUE(AllProfilesHaveSameApps()); ASSERT_TRUE(AllProfilesHaveSameApps());
} }
IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, MAYBE_InstallSomeApps) { IN_PROC_BROWSER_TEST_P(SingleClientExtensionAppsSyncTest,
MAYBE_InstallSomeApps) {
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
int i = 0; int i = 0;
...@@ -136,11 +140,11 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, MAYBE_InstallSomeApps) { ...@@ -136,11 +140,11 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsSyncTest, MAYBE_InstallSomeApps) {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// Tests for SplitSettingsSync. // Tests for SplitSettingsSync.
class SingleClientAppsOsSyncTest class SingleClientExtensionAppsOsSyncTest
: public OsSyncTest, : public OsSyncTest,
public ::testing::WithParamInterface<web_app::ProviderType> { public ::testing::WithParamInterface<web_app::ProviderType> {
public: public:
SingleClientAppsOsSyncTest() : OsSyncTest(SINGLE_CLIENT) { SingleClientExtensionAppsOsSyncTest() : OsSyncTest(SINGLE_CLIENT) {
switch (GetParam()) { switch (GetParam()) {
case web_app::ProviderType::kWebApps: case web_app::ProviderType::kWebApps:
scoped_feature_list_.InitAndEnableFeature( scoped_feature_list_.InitAndEnableFeature(
...@@ -152,15 +156,15 @@ class SingleClientAppsOsSyncTest ...@@ -152,15 +156,15 @@ class SingleClientAppsOsSyncTest
break; break;
} }
} }
~SingleClientAppsOsSyncTest() override = default; ~SingleClientExtensionAppsOsSyncTest() override = default;
private: private:
base::test::ScopedFeatureList scoped_feature_list_; base::test::ScopedFeatureList scoped_feature_list_;
DISALLOW_COPY_AND_ASSIGN(SingleClientAppsOsSyncTest); DISALLOW_COPY_AND_ASSIGN(SingleClientExtensionAppsOsSyncTest);
}; };
IN_PROC_BROWSER_TEST_P(SingleClientAppsOsSyncTest, IN_PROC_BROWSER_TEST_P(SingleClientExtensionAppsOsSyncTest,
DisablingOsSyncFeatureDisablesDataType) { DisablingOsSyncFeatureDisablesDataType) {
ASSERT_TRUE(chromeos::features::IsSplitSettingsSyncEnabled()); ASSERT_TRUE(chromeos::features::IsSplitSettingsSyncEnabled());
ASSERT_TRUE(SetupSync()); ASSERT_TRUE(SetupSync());
...@@ -176,7 +180,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsOsSyncTest, ...@@ -176,7 +180,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientAppsOsSyncTest,
} }
INSTANTIATE_TEST_SUITE_P(All, INSTANTIATE_TEST_SUITE_P(All,
SingleClientAppsOsSyncTest, SingleClientExtensionAppsOsSyncTest,
::testing::Values(web_app::ProviderType::kBookmarkApps, ::testing::Values(web_app::ProviderType::kBookmarkApps,
web_app::ProviderType::kWebApps), web_app::ProviderType::kWebApps),
web_app::ProviderTypeParamToString); web_app::ProviderTypeParamToString);
...@@ -184,7 +188,7 @@ INSTANTIATE_TEST_SUITE_P(All, ...@@ -184,7 +188,7 @@ INSTANTIATE_TEST_SUITE_P(All,
#endif // defined(OS_CHROMEOS) #endif // defined(OS_CHROMEOS)
INSTANTIATE_TEST_SUITE_P(All, INSTANTIATE_TEST_SUITE_P(All,
SingleClientAppsSyncTest, SingleClientExtensionAppsSyncTest,
::testing::Values(web_app::ProviderType::kBookmarkApps, ::testing::Values(web_app::ProviderType::kBookmarkApps,
web_app::ProviderType::kWebApps), web_app::ProviderType::kWebApps),
web_app::ProviderTypeParamToString); web_app::ProviderTypeParamToString);
...@@ -6293,13 +6293,13 @@ if (!is_fuchsia && !is_android) { ...@@ -6293,13 +6293,13 @@ if (!is_fuchsia && !is_android) {
"../browser/sync/test/integration/migration_test.cc", "../browser/sync/test/integration/migration_test.cc",
"../browser/sync/test/integration/password_manager_sync_test.cc", "../browser/sync/test/integration/password_manager_sync_test.cc",
"../browser/sync/test/integration/single_client_app_settings_sync_test.cc", "../browser/sync/test/integration/single_client_app_settings_sync_test.cc",
"../browser/sync/test/integration/single_client_apps_sync_test.cc",
"../browser/sync/test/integration/single_client_autofill_profile_sync_test.cc", "../browser/sync/test/integration/single_client_autofill_profile_sync_test.cc",
"../browser/sync/test/integration/single_client_bookmarks_sync_test.cc", "../browser/sync/test/integration/single_client_bookmarks_sync_test.cc",
"../browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc", "../browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc",
"../browser/sync/test/integration/single_client_device_info_sync_test.cc", "../browser/sync/test/integration/single_client_device_info_sync_test.cc",
"../browser/sync/test/integration/single_client_dictionary_sync_test.cc", "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
"../browser/sync/test/integration/single_client_directory_sync_test.cc", "../browser/sync/test/integration/single_client_directory_sync_test.cc",
"../browser/sync/test/integration/single_client_extension_apps_sync_test.cc",
"../browser/sync/test/integration/single_client_extensions_sync_test.cc", "../browser/sync/test/integration/single_client_extensions_sync_test.cc",
"../browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc", "../browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc",
"../browser/sync/test/integration/single_client_nigori_sync_test.cc", "../browser/sync/test/integration/single_client_nigori_sync_test.cc",
......
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