Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(456)

Side by Side Diff: chrome/browser/notifications/platform_notification_service_interactive_uitest.cc

Issue 2957983002: Remove pointless InProcessBrowserTest calls. (Closed)
Patch Set: build Created 3 years, 5 months 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
OLDNEW
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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/feature_list.h" 10 #include "base/feature_list.h"
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 // InProcessBrowserTest overrides. 831 // InProcessBrowserTest overrides.
832 void SetUpInProcessBrowserTestFixture() override { 832 void SetUpInProcessBrowserTestFixture() override {
833 #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) 833 #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
834 scoped_feature_list_.InitWithFeatures( 834 scoped_feature_list_.InitWithFeatures(
835 {}, 835 {},
836 {features::kNotificationContentImage, features::kNativeNotifications}); 836 {features::kNotificationContentImage, features::kNativeNotifications});
837 #else 837 #else
838 scoped_feature_list_.InitWithFeatures( 838 scoped_feature_list_.InitWithFeatures(
839 {}, {features::kNotificationContentImage}); 839 {}, {features::kNotificationContentImage});
840 #endif // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) 840 #endif // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
841 InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
842 } 841 }
843 842
844 private: 843 private:
845 base::test::ScopedFeatureList scoped_feature_list_; 844 base::test::ScopedFeatureList scoped_feature_list_;
846 }; 845 };
847 846
848 IN_PROC_BROWSER_TEST_F( 847 IN_PROC_BROWSER_TEST_F(
849 PlatformNotificationServiceWithoutContentImageBrowserTest, 848 PlatformNotificationServiceWithoutContentImageBrowserTest,
850 KillSwitch) { 849 KillSwitch) {
851 ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest()); 850 ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest());
852 851
853 std::string script_result; 852 std::string script_result;
854 ASSERT_TRUE( 853 ASSERT_TRUE(
855 RunScript("DisplayPersistentAllOptionsNotification()", &script_result)); 854 RunScript("DisplayPersistentAllOptionsNotification()", &script_result));
856 EXPECT_EQ("ok", script_result); 855 EXPECT_EQ("ok", script_result);
857 856
858 ASSERT_EQ(1u, ui_manager()->GetNotificationCount()); 857 ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
859 const Notification& notification = ui_manager()->GetNotificationAt(0); 858 const Notification& notification = ui_manager()->GetNotificationAt(0);
860 859
861 // Since the kNotificationContentImage kill switch has disabled images, the 860 // Since the kNotificationContentImage kill switch has disabled images, the
862 // notification should be shown without an image. 861 // notification should be shown without an image.
863 EXPECT_TRUE(notification.image().IsEmpty()); 862 EXPECT_TRUE(notification.image().IsEmpty());
864 } 863 }
OLDNEW
« no previous file with comments | « chrome/browser/net/predictor_browsertest.cc ('k') | chrome/browser/payments/site_per_process_payments_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698