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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

Issue 2960703003: Add a feature flag for network service and about:flags entry for it. (Closed)
Patch Set: merge 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/flag_descriptions.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 2855832939219ab3b501f75de60de18c4741e4ba..aca92459484ce85ca4b437f374c7e0c4bcbd8e6d 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -67,7 +67,7 @@
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/common/content_switches.h"
+#include "content/public/common/content_features.h"
#include "content/public/test/browser_test_utils.h"
#include "crypto/sha2.h"
#include "net/cookies/cookie_store.h"
@@ -1483,10 +1483,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, StartAndStop) {
IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, MalwareWebSocketBlocked) {
// This test currently only passes when the network service is enabled.
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- ::switches::kEnableNetworkService)) {
+ if (!base::FeatureList::IsEnabled(features::kNetworkService))
return;
- }
GURL main_url = embedded_test_server()->GetURL(kMalwareWebSocketPage);
// This constructs the URL with the same logic as malware_websocket.html.
GURL resolved = main_url.Resolve("/safe_browsing/malware-ws");
@@ -2254,10 +2252,8 @@ IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest, CheckBrowseUrl) {
// when the old database backend stops being used.
IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest, MalwareWebSocketBlocked) {
// This test currently only passes when the network service is enabled.
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- ::switches::kEnableNetworkService)) {
+ if (!base::FeatureList::IsEnabled(features::kNetworkService))
return;
- }
GURL main_url = embedded_test_server()->GetURL(kMalwareWebSocketPage);
// This constructs the URL with the same logic as malware_websocket.html.
GURL resolved = main_url.Resolve("/safe_browsing/malware-ws");
« no previous file with comments | « chrome/browser/flag_descriptions.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698