Remove web test code from ShellContentBrowserClient

There is a web test override class already, named
WebTestContentBrowserClient. Any test-only code should live in that
class.

[email protected]

Bug: 866140
Change-Id: Ib14d8cd15a577fe5244eb83b3a9dabfb8ef1f139
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2119376
Auto-Submit: danakj <[email protected]>
Commit-Queue: Avi Drissman <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#753636}
diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h
index 9acb46b..04f77b29 100644
--- a/content/shell/browser/shell_content_browser_client.h
+++ b/content/shell/browser/shell_content_browser_client.h
@@ -39,8 +39,6 @@
   bool IsHandledURL(const GURL& url) override;
   bool ShouldTerminateOnServiceQuit(
       const service_manager::Identity& id) override;
-  base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
-      base::StringPiece name) override;
   void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                       int child_process_id) override;
   std::string GetAcceptLangs(BrowserContext* context) override;
@@ -135,10 +133,16 @@
   }
 
  protected:
+  // Call this if CreateBrowserMainParts() is overridden in a subclass.
   void set_browser_main_parts(ShellBrowserMainParts* parts) {
     shell_browser_main_parts_ = parts;
   }
 
+  // Used by CreateNetworkContext(), and can be overridden to change the
+  // parameters used there.
+  virtual network::mojom::NetworkContextParamsPtr CreateNetworkContextParams(
+      BrowserContext* context);
+
  private:
   base::OnceClosure select_client_certificate_callback_;
   base::OnceCallback<bool(const service_manager::Identity&)>