Remove BrowserPluginGuestManager from ShellBrowserContext

A non-null BrowserPluginGuestManager is never set, so we remove the
member variable.

We also do a bit of polish on the ShellBrowserContext's constructor
since we're in the area.

Bug: 533069
Change-Id: I2bba2b59fa022c407803acb065df29b701d98d91
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432756
Commit-Queue: Kevin McNee <mcnee@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811804}

content/shell/browser/shell_browser_context.cc

@@ -48,10 +48,8 @@ ShellBrowserContext::ShellResourceContext::~ShellResourceContext() {
 
 ShellBrowserContext::ShellBrowserContext(bool off_the_record,
                                          bool delay_services_creation)
-    : resource_context_(new ShellResourceContext),
-      ignore_certificate_errors_(false),
-      off_the_record_(off_the_record),
-      guest_manager_(nullptr) {
+    : resource_context_(std::make_unique<ShellResourceContext>()),
+      off_the_record_(off_the_record) {
   InitWhileIOAllowed();
   if (!delay_services_creation) {
     BrowserContextDependencyManager::GetInstance()
@@ -167,7 +165,7 @@ ResourceContext* ShellBrowserContext::GetResourceContext()  {
 }
 
 BrowserPluginGuestManager* ShellBrowserContext::GetGuestManager() {
-  return guest_manager_;
+  return nullptr;
 }
 
 storage::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {

content/shell/browser/shell_browser_context.h

@@ -37,11 +37,6 @@ class ShellBrowserContext : public BrowserContext {
                       bool delay_services_creation = false);
   ~ShellBrowserContext() override;
 
-  void set_guest_manager_for_testing(
-      BrowserPluginGuestManager* guest_manager) {
-    guest_manager_ = guest_manager;
-  }
-
   void set_client_hints_controller_delegate(
       ClientHintsControllerDelegate* delegate) {
     client_hints_controller_delegate_ = delegate;
@@ -93,10 +88,9 @@ class ShellBrowserContext : public BrowserContext {
   void InitWhileIOAllowed();
   void FinishInitWhileIOAllowed();
 
-  bool ignore_certificate_errors_;
-  bool off_the_record_;
+  const bool off_the_record_;
+  bool ignore_certificate_errors_ = false;
   base::FilePath path_;
-  BrowserPluginGuestManager* guest_manager_;
   std::unique_ptr<SimpleFactoryKey> key_;
   ClientHintsControllerDelegate* client_hints_controller_delegate_ = nullptr;