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

Unified Diff: content/public/test/browser_test_base.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 | « content/public/common/content_switches.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index f4e1e08511625ff4f678057479bef4014dab7648..b007eab1cde394da9ab26787fdfbfd773439d683 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -26,6 +26,7 @@
#include "content/browser/tracing/tracing_controller_impl.h"
#include "content/public/app/content_main.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
#include "content/public/common/network_service_test.mojom.h"
@@ -380,8 +381,8 @@ bool BrowserTestBase::UsingSoftwareGL() const {
void BrowserTestBase::InitializeNetworkProcess() {
const testing::TestInfo* const test_info =
testing::UnitTest::GetInstance()->current_test_info();
- bool network_service = base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableNetworkService);
+ bool network_service =
+ base::FeatureList::IsEnabled(features::kNetworkService);
// ProcessTransferAfterError is the only browser test which needs to modify
// the host rules (when not using the network service).
if (network_service ||
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698