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

extensions/shell/browser/shell_extension_host_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/shell/browser/shell_extension_host_delegate.h"
 
+#include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "extensions/browser/serial_extension_host_queue.h"
 #include "extensions/shell/browser/media_capture_util.h"
 #include "extensions/shell/browser/shell_extension_web_contents_observer.h"
 
 namespace extensions {
 
 ShellExtensionHostDelegate::ShellExtensionHostDelegate() {
 }
 
 ShellExtensionHostDelegate::~ShellExtensionHostDelegate() {
 }
@@ skipping 36 matching lines @@
 
 bool ShellExtensionHostDelegate::CheckMediaAccessPermission(
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type,
     const Extension* extension) {
   media_capture_util::VerifyMediaAccessPermission(type, extension);
   return true;
 }
 
+static base::LazyInstance<SerialExtensionHostQueue> g_queue =
+    LAZY_INSTANCE_INITIALIZER;
+
+ExtensionHostQueue* ShellExtensionHostDelegate::GetExtensionHostQueue() const {
+  return g_queue.Pointer();
+}
+
 }  // namespace extensions