| Index: chrome/browser/notifications/notification_interactive_uitest_support.cc
|
| diff --git a/chrome/browser/notifications/notification_interactive_uitest_support.cc b/chrome/browser/notifications/notification_interactive_uitest_support.cc
|
| index 4a71efed6bd8ecbdab2db0a0f3b9d82ab46464a4..30d6f6fa15a5cb9367fb0cadb3d290ee3457035a 100644
|
| --- a/chrome/browser/notifications/notification_interactive_uitest_support.cc
|
| +++ b/chrome/browser/notifications/notification_interactive_uitest_support.cc
|
| @@ -118,9 +118,7 @@ bool MessageCenterChangeObserver::Wait() {
|
|
|
| // -----------------------------------------------------------------------------
|
|
|
| -void NotificationsTest::SetUpDefaultCommandLine(
|
| - base::CommandLine* command_line) {
|
| - InProcessBrowserTest::SetUpDefaultCommandLine(command_line);
|
| +NotificationsTest::NotificationsTest() {
|
| // Temporary change while the whole support class is changed to deal
|
| // with native notifications. crbug.com/714679
|
| #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
|
| @@ -305,46 +303,25 @@ content::WebContents* NotificationsTest::GetActiveWebContents(
|
|
|
| void NotificationsTest::EnablePermissionsEmbargo(
|
| base::test::ScopedFeatureList* scoped_feature_list) {
|
| -#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
|
| - scoped_feature_list->InitWithFeatures(
|
| - {features::kBlockPromptsIfDismissedOften,
|
| - features::kBlockPromptsIfIgnoredOften},
|
| - {features::kNativeNotifications});
|
| -#else
|
| scoped_feature_list->InitWithFeatures(
|
| {features::kBlockPromptsIfDismissedOften,
|
| features::kBlockPromptsIfIgnoredOften},
|
| {});
|
| -#endif // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
|
| }
|
|
|
| void NotificationsTest::EnableFullscreenNotifications(
|
| base::test::ScopedFeatureList* scoped_feature_list) {
|
| -#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
|
| - scoped_feature_list->InitWithFeatures(
|
| - {features::kPreferHtmlOverPlugins,
|
| - features::kAllowFullscreenWebNotificationsFeature},
|
| - {features::kNativeNotifications});
|
| -#else
|
| scoped_feature_list->InitWithFeatures(
|
| {features::kPreferHtmlOverPlugins,
|
| features::kAllowFullscreenWebNotificationsFeature},
|
| {});
|
| -#endif // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
|
| }
|
|
|
| void NotificationsTest::DisableFullscreenNotifications(
|
| base::test::ScopedFeatureList* scoped_feature_list) {
|
| -#if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
|
| - scoped_feature_list->InitWithFeatures(
|
| - {features::kPreferHtmlOverPlugins},
|
| - {features::kAllowFullscreenWebNotificationsFeature,
|
| - features::kNativeNotifications});
|
| -#else
|
| scoped_feature_list->InitWithFeatures(
|
| {features::kPreferHtmlOverPlugins},
|
| {features::kAllowFullscreenWebNotificationsFeature});
|
| -#endif // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
|
| }
|
|
|
| void NotificationsTest::DropOriginPreference(const GURL& origin) {
|
|
|