Fix --log-net-log when Network Service is enabled.
Bug: 894801
Change-Id: Ieb17a626284296b6f86f4cf9add2fca4359f7d8a
Reviewed-on: https://chromium-review.googlesource.com/c/1285649
Commit-Queue: Eric Roman <[email protected]>
Reviewed-by: Matt Menke <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Cr-Commit-Position: refs/heads/master@{#600592}diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index f730834..374f159 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -138,6 +138,7 @@
#include "net/url_request/url_request_context_getter.h"
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
+#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/network_switches.h"
#include "services/preferences/public/cpp/in_process_service_factory.h"
#include "ui/base/idle/idle.h"
@@ -1147,7 +1148,8 @@
extensions::kExtensionScheme, true);
#endif
- if (command_line.HasSwitch(network::switches::kLogNetLog)) {
+ if (command_line.HasSwitch(network::switches::kLogNetLog) &&
+ !base::FeatureList::IsEnabled(network::features::kNetworkService)) {
base::FilePath log_file =
command_line.GetSwitchValuePath(network::switches::kLogNetLog);
if (log_file.empty()) {
