Allow app_shell to run past extension manifest parsing

chrome/browser/extensions/extension_web_contents_observer.cc

 // Copyright 2013 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 "chrome/browser/extensions/extension_web_contents_observer.h"
 
 #include "chrome/browser/extensions/api/messaging/message_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/messaging/message.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::ExtensionWebContentsObserver);
 
 namespace extensions {
 
 ExtensionWebContentsObserver::ExtensionWebContentsObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
@@ skipping 23 matching lines @@
       type == Manifest::TYPE_LEGACY_PACKAGED_APP ||
       (type == Manifest::TYPE_PLATFORM_APP &&
        extension->location() == Manifest::COMPONENT)) {
     content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
         process->GetID(), chrome::kChromeUIScheme);
   }
 
   // Some extensions use file:// URLs.
   if (type == Manifest::TYPE_EXTENSION ||
       type == Manifest::TYPE_LEGACY_PACKAGED_APP) {
-    if (ExtensionSystem::Get(profile_)->extension_service()->
-            extension_prefs()->AllowFileAccess(extension->id())) {
+    if (ExtensionPrefs::Get(profile_)->AllowFileAccess(extension->id())) {
       content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
           process->GetID(), content::kFileScheme);
     }
   }
 
   switch (type) {
     case Manifest::TYPE_EXTENSION:
     case Manifest::TYPE_USER_SCRIPT:
     case Manifest::TYPE_HOSTED_APP:
     case Manifest::TYPE_LEGACY_PACKAGED_APP:
@@ skipping 38 matching lines @@
     content::RenderViewHost* render_view_host) {
   // Note that due to ChromeContentBrowserClient::GetEffectiveURL(), hosted apps
   // (excluding bookmark apps) will have a chrome-extension:// URL for their
   // site, so we can ignore that wrinkle here.
   content::SiteInstance* site_instance = render_view_host->GetSiteInstance();
   const GURL& site = site_instance->GetSiteURL();
 
   if (!site.SchemeIs(kExtensionScheme))
     return NULL;
 
-  ExtensionService* service = profile_->GetExtensionService();
+  ExtensionService* service =
+      ExtensionSystem::Get(profile_)->extension_service();
   if (!service)
     return NULL;
 
   // Reload the extension if it has crashed.
   // TODO(yoz): This reload doesn't happen synchronously for unpacked
   //            extensions. It seems to be fast enough, but there is a race.
   //            We should delay loading until the extension has reloaded.
   if (service->GetTerminatedExtension(site.host()))
     service->ReloadExtension(site.host());
 
   // May be null if the extension doesn't exist, for example if somebody typos
   // a chrome-extension:// URL.
-  return service->extensions()->GetByID(site.host());
+  return ExtensionRegistry::Get(profile_)->enabled_extensions().GetByID(
+      site.host());
 }
 
 }  // namespace extensions