GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

extensions/shell/browser/shell_browser_context.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_browser_context.h"
 
 #include "base/command_line.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
@@ skipping 17 matching lines @@
 ShellBrowserContext::ShellBrowserContext()
     : content::ShellBrowserContext(false /* off_the_record */,
                                    nullptr /* net_log */),
       storage_policy_(new ShellSpecialStoragePolicy) {
 }
 
 ShellBrowserContext::~ShellBrowserContext() {
 }
 
 content::BrowserPluginGuestManager* ShellBrowserContext::GetGuestManager() {
-  return GuestViewManager::FromBrowserContextIfAvailable(this);
+  return GuestViewManager::FromBrowserContext(this);
 }
 
 storage::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {
   return storage_policy_.get();
 }
 
 net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors,
       InfoMap* extension_info_map) {
@@ skipping 24 matching lines @@
 
 void ShellBrowserContext::InitURLRequestContextOnIOThread() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   // GetURLRequestContext() will create a URLRequestContext if it isn't
   // initialized.
   url_request_context_getter()->GetURLRequestContext();
 }
 
 }  // namespace extensions