extensions: Remove virtual functions that are never overridden.

Bug: 855193
Change-Id: I2e30bd2e6188a7695b469955c896dd5900fb1793
Reviewed-on: https://chromium-review.googlesource.com/1157545Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579924}

extensions/shell/app/shell_main_delegate.cc

@@ -13,7 +13,6 @@
 #include "components/nacl/common/buildflags.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/utility/content_utility_client.h"
 #include "content/shell/common/shell_switches.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/shell/browser/default_shell_browser_main_delegate.h"
@@ -135,7 +134,7 @@ ShellMainDelegate::~ShellMainDelegate() {
 
 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   InitLogging();
-  content_client_.reset(CreateContentClient());
+  content_client_.reset(new ShellContentClient);
   SetContentClient(content_client_.get());
 
 #if defined(OS_CHROMEOS)
@@ -160,17 +159,19 @@ void ShellMainDelegate::PreSandboxStartup() {
 #endif
 
   if (ProcessNeedsResourceBundle(process_type))
-    InitializeResourceBundle();
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(
+        GetResourcesPakFilePath());
 }
 
 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
-  browser_client_.reset(CreateShellContentBrowserClient());
+  browser_client_ = std::make_unique<ShellContentBrowserClient>(
+      new DefaultShellBrowserMainDelegate);
   return browser_client_.get();
 }
 
 content::ContentRendererClient*
 ShellMainDelegate::CreateContentRendererClient() {
-  renderer_client_.reset(CreateShellContentRendererClient());
+  renderer_client_ = std::make_unique<ShellContentRendererClient>();
   return renderer_client_.get();
 }
 
@@ -197,30 +198,6 @@ void ShellMainDelegate::ZygoteForked() {
 }
 #endif
 
-content::ContentClient* ShellMainDelegate::CreateContentClient() {
-  return new ShellContentClient();
-}
-
-content::ContentBrowserClient*
-ShellMainDelegate::CreateShellContentBrowserClient() {
-  return new ShellContentBrowserClient(new DefaultShellBrowserMainDelegate());
-}
-
-content::ContentRendererClient*
-ShellMainDelegate::CreateShellContentRendererClient() {
-  return new ShellContentRendererClient();
-}
-
-content::ContentUtilityClient*
-ShellMainDelegate::CreateShellContentUtilityClient() {
-  return new content::ContentUtilityClient();
-}
-
-void ShellMainDelegate::InitializeResourceBundle() {
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(
-      GetResourcesPakFilePath());
-}
-
 // static
 bool ShellMainDelegate::ProcessNeedsResourceBundle(
     const std::string& process_type) {

extensions/shell/app/shell_main_delegate.h

@@ -41,16 +41,6 @@ class ShellMainDelegate : public content::ContentMainDelegate {
   void ZygoteForked() override;
 #endif
 
- protected:
-  // The created object is owned by this object.
-  virtual content::ContentClient* CreateContentClient();
-  virtual content::ContentBrowserClient* CreateShellContentBrowserClient();
-  virtual content::ContentRendererClient* CreateShellContentRendererClient();
-  virtual content::ContentUtilityClient* CreateShellContentUtilityClient();
-
-  // Initializes the resource bundle and resources.pak.
-  virtual void InitializeResourceBundle();
-
  private:
   // |process_type| is zygote, renderer, utility, etc. Returns true if the
   // process needs data from resources.pak.
@@ -59,7 +49,6 @@ class ShellMainDelegate : public content::ContentMainDelegate {
   std::unique_ptr<content::ContentClient> content_client_;
   std::unique_ptr<content::ContentBrowserClient> browser_client_;
   std::unique_ptr<content::ContentRendererClient> renderer_client_;
-  std::unique_ptr<content::ContentUtilityClient> utility_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
 };