Extensions: DCHECK that all app pages are blessed before use.

extensions/renderer/dispatcher.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/renderer/dispatcher.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 250 matching lines @@
     int world_id) {
 #if !defined(ENABLE_EXTENSIONS)
   return;
 #endif
 
   const Extension* extension =
       GetExtensionFromFrameAndWorld(frame, world_id, false);
   const Extension* effective_extension =
       GetExtensionFromFrameAndWorld(frame, world_id, true);
 
+  bool extension_is_platform_app = extension && extension->is_platform_app();
+
+  // If we are navigating to a platform app URL, the extension must first have
+  // been activated. If not, IsWithinPlatformApp will incorrectly return false,
+  // and we will be missing information about what features the app has.
+  // (Note: This DCHECK is invalid for non-app extensions, which do not get
+  // activated in "unblessed" contexts such as content scripts and iframes.)
+  if (extension_is_platform_app)
+    DCHECK(IsExtensionActive(extension_id));
+
   GURL frame_url = ScriptContext::GetDataSourceURLForFrame(frame);
   Feature::Context context_type =
       ClassifyJavaScriptContext(extension,
                                 extension_group,
                                 frame_url,
                                 frame->document().securityOrigin());
   Feature::Context effective_context_type = ClassifyJavaScriptContext(
       effective_extension,
       extension_group,
       ScriptContext::GetEffectiveDocumentURL(frame, frame_url, true),
@@ skipping 29 matching lines @@
   // lazily evalulate to Event from event_bindings.js. For extensions only
   // though, not all webpages!
   if (context->extension()) {
     v8::Handle<v8::Object> chrome = AsObjectOrEmpty(GetOrCreateChrome(context));
     if (!chrome.IsEmpty())
       module_system->SetLazyField(chrome, "Event", kEventBindings, "Event");
   }
 
   UpdateBindingsForContext(context);
 
-  bool is_within_platform_app = IsWithinPlatformApp();
   // Inject custom JS into the platform app context.
-  if (is_within_platform_app) {
+  if (extension_is_platform_app) {
     module_system->Require("platformApp");
   }
 
-  delegate_->RequireAdditionalModules(context, is_within_platform_app);
+  delegate_->RequireAdditionalModules(context, extension_is_platform_app);
 
   VLOG(1) << "Num tracked contexts: " << script_context_set_.size();
 }
 
 void Dispatcher::WillReleaseScriptContext(
     WebFrame* frame,
     const v8::Handle<v8::Context>& v8_context,
     int world_id) {
   ScriptContext* context = script_context_set_.GetByV8Context(v8_context);
   if (!context)
@@ skipping 1008 matching lines @@
     return v8::Handle<v8::Object>();
 
   if (bind_name)
     *bind_name = split.back();
 
   return bind_object.IsEmpty() ? AsObjectOrEmpty(GetOrCreateChrome(context))
                                : bind_object;
 }
 
 }  // namespace extensions