Add a feature flag for network service and about:flags entry for it.

chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This test creates a safebrowsing service using test safebrowsing database
 // and a test protocol manager. It is used to test logics in safebrowsing
 // service.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
@@ skipping 47 matching lines @@
 #include "components/safe_browsing_db/test_database_manager.h"
 #include "components/safe_browsing_db/util.h"
 #include "components/safe_browsing_db/v4_database.h"
 #include "components/safe_browsing_db/v4_feature_list.h"
 #include "components/safe_browsing_db/v4_get_hash_protocol_manager.h"
 #include "components/safe_browsing_db/v4_protocol_manager_util.h"
 #include "content/public/browser/interstitial_page.h"
 #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"
 #include "net/cookies/cookie_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 1398 matching lines @@
   // Delete the Profile. SBS stops again.
   pref_service2 = nullptr;
   profile2.reset();
   EXPECT_FALSE(sb_service->enabled_by_prefs());
   WaitForIOAndCheckEnabled(sb_service, false);
   EXPECT_FALSE(csd_service->enabled());
 }
 
 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");
   GURL::Replacements replace_scheme;
   replace_scheme.SetScheme("ws", url::Component(0, strlen("ws")));
   GURL websocket_url = resolved.ReplaceComponents(replace_scheme);
 
   // Add the WebSocket url as malware.
   SBFullHashResult uws_full_hash;
   GenUrlFullHashResult(websocket_url, MALWARE, &uws_full_hash);
@@ skipping 749 matching lines @@
     client->CheckBrowseUrl(bad_url);
     EXPECT_EQ(SB_THREAT_TYPE_URL_MALWARE, client->GetThreatType());
   }
 }
 
 // This is almost identical to
 // SafeBrowsingServiceTest.MalwareWebSocketBlocked. That test will be deleted
 // 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");
   GURL::Replacements replace_scheme;
   replace_scheme.SetScheme("ws", url::Component(0, strlen("ws")));
   GURL websocket_url = resolved.ReplaceComponents(replace_scheme);
 
   MarkUrlForMalwareUnexpired(websocket_url);
 
   // Brute force method for waiting for the interstitial to be displayed.
@@ skipping 205 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     MaybeSetMetadata,
     V4SafeBrowsingServiceMetadataTest,
     testing::Values(ThreatPatternType::NONE,
                     ThreatPatternType::MALWARE_LANDING,
                     ThreatPatternType::MALWARE_DISTRIBUTION));
 
 }  // namespace safe_browsing