Remove ShellContentRendererClient::ShouldFork.
This only checked for the kContentShellAlwaysFork switch, which seems
to be unused.
Bug: 883549
Change-Id: Ib9e5e9df79caaa0e2d6cda8457b84cf4d391064c
Reviewed-on: https://chromium-review.googlesource.com/1226462
Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591509}diff --git a/content/shell/common/shell_switches.cc b/content/shell/common/shell_switches.cc
index 9610f57f..569ee5b 100644
--- a/content/shell/common/shell_switches.cc
+++ b/content/shell/common/shell_switches.cc
@@ -39,10 +39,6 @@
// Hides toolbar from content_shell's host window.
const char kContentShellHideToolbar[] = "content-shell-hide-toolbar";
-// Forces all navigations to go through the browser process (in a
-// non-PlzNavigate way).
-const char kContentShellAlwaysFork[] = "content-shell-always-fork";
-
std::vector<std::string> GetSideloadFontFiles() {
std::vector<std::string> files;
const base::CommandLine& command_line =
diff --git a/content/shell/common/shell_switches.h b/content/shell/common/shell_switches.h
index 77f7204..b8bc4d7 100644
--- a/content/shell/common/shell_switches.h
+++ b/content/shell/common/shell_switches.h
@@ -19,7 +19,6 @@
extern const char kRegisterFontFiles[];
extern const char kContentShellHostWindowSize[];
extern const char kContentShellHideToolbar[];
-extern const char kContentShellAlwaysFork[];
// Returns list of extra font files to be made accessible to the renderer.
std::vector<std::string> GetSideloadFontFiles();
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index 917d2def..4b9e926a 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -190,18 +190,6 @@
}
}
-bool ShellContentRendererClient::ShouldFork(blink::WebLocalFrame* frame,
- const GURL& url,
- const std::string& http_method,
- bool is_initial_navigation,
- bool is_server_redirect) {
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kContentShellAlwaysFork)) {
- return true;
- }
- return false;
-}
-
#if BUILDFLAG(ENABLE_MOJO_CDM)
void ShellContentRendererClient::AddSupportedKeySystems(
std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) {
diff --git a/content/shell/renderer/shell_content_renderer_client.h b/content/shell/renderer/shell_content_renderer_client.h
index 908fa684..2dd4662 100644
--- a/content/shell/renderer/shell_content_renderer_client.h
+++ b/content/shell/renderer/shell_content_renderer_client.h
@@ -49,12 +49,6 @@
void DidInitializeWorkerContextOnWorkerThread(
v8::Local<v8::Context> context) override;
- bool ShouldFork(blink::WebLocalFrame* frame,
- const GURL& url,
- const std::string& http_method,
- bool is_initial_navigation,
- bool is_server_redirect) override;
-
#if BUILDFLAG(ENABLE_MOJO_CDM)
void AddSupportedKeySystems(
std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems)
