Merge 317853 - Make BackgroundContentsService start up BackgroundContents with a delay, as for Exte…

chrome/browser/extensions/chrome_extension_host_delegate.cc

Index: chrome/browser/extensions/chrome_extension_host_delegate.cc
diff --git a/chrome/browser/extensions/chrome_extension_host_delegate.cc b/chrome/browser/extensions/chrome_extension_host_delegate.cc
index 8cb4ec64e5bd623e768ab23f4c68dbf8c3b5988e..6a1af5e4da65c4d7d9a63dba469ecb9946c25ab1 100644
--- a/chrome/browser/extensions/chrome_extension_host_delegate.cc
+++ b/chrome/browser/extensions/chrome_extension_host_delegate.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/chrome_extension_host_delegate.h"
 
+#include "base/lazy_instance.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ -12,6 +13,7 @@
 #include "components/app_modal/javascript_dialog_manager.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/serial_extension_host_queue.h"
 
 namespace extensions {
 
@@ -66,4 +68,11 @@ bool ChromeExtensionHostDelegate::CheckMediaAccessPermission(
           web_contents, security_origin, type, extension);
 }
 
+static base::LazyInstance<SerialExtensionHostQueue> g_queue =
+    LAZY_INSTANCE_INITIALIZER;
+
+ExtensionHostQueue* ChromeExtensionHostDelegate::GetExtensionHostQueue() const {
+  return g_queue.Pointer();
+}
+
 }  // namespace extensions