Show hosted app requests to extensions

extensions/browser/api/web_request/web_request_api.cc

 // Copyright (c) 2012 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/browser/api/web_request/web_request_api.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 129 matching lines @@
   }
   const auto web_request_events_end =
       kWebRequestEvents + arraysize(kWebRequestEvents);
   return std::find(kWebRequestEvents, web_request_events_end,
                    web_request_event_name) != web_request_events_end;
 }
 
 // Returns whether |request| has been triggered by an extension in
 // |extension_info_map|.
 bool IsRequestFromExtension(const net::URLRequest* request,
-                            const InfoMap* extension_info_map) {
+                            const InfoMap* extension_info_map,
+                            void* browser_context_id) {
   // |extension_info_map| is NULL for system-level requests.
   if (!extension_info_map)
     return false;
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
 
   // If this request was not created by the ResourceDispatcher, |info| is NULL.
   // All requests from extensions are created by the ResourceDispatcher.
   if (!info)
     return false;
 
-  return extension_info_map->process_map().Contains(info->GetChildID());
+  const std::set<std::string> extension_ids =
+      extension_info_map->process_map().GetExtensionsInProcess(
+          info->GetChildID());
+  if (extension_ids.empty())
+    return false;
+
+  content::BrowserContext* browser_context =
+      reinterpret_cast<content::BrowserContext*>(browser_context_id);
+  if (browser_context) {

[robwu, 2015/09/05 17:29:10]

I'm not sure whether it is safe to use |browser_context| without checking
extensions::ExtensionsBrowserClient::Get()->IsValidContext(browser_context). I
omitted the check because this method only works on the UI thread, and without
the check the logic still works as intended.

[not at google - send to devlin, 2015/09/08 16:09:20]

It's not valid to use the BrowserContext on the IO thread at all, which is why
the idiom is for it to be passed around as a void*.

can you use extension_info_map->extensions()?

[robwu, 2015/09/08 17:19:48]

Yes, of course.

+    // Hosted apps are like normal web pages (crbug.com/526413).
+    const ExtensionSet& enabled_extensions =
+        ExtensionRegistry::Get(browser_context)->enabled_extensions();
+    for (const std::string& extension_id : extension_ids) {
+      const Extension* extension = enabled_extensions.GetByID(extension_id);
+      if (extension && !extension->is_hosted_app())
+        return true;
+    }
+  }
+  return false;
 }
 
 void ExtractRequestRoutingInfo(const net::URLRequest* request,
                                int* render_process_host_id,
                                int* routing_id) {
   if (!request->GetUserData(NULL))
     return;
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   *render_process_host_id = info->GetChildID();
   *routing_id = info->GetRouteID();
@@ skipping 1407 matching lines @@
   int routing_id = -1;
   ResourceType resource_type = content::RESOURCE_TYPE_LAST_TYPE;
   const GURL& url = request->url();
 
   ExtractRequestInfoDetails(request, &is_main_frame, &frame_id,
                             &parent_is_main_frame, &parent_frame_id,
                             &render_process_host_id,
                             &routing_id, &resource_type);
 
   bool is_request_from_extension =
-      IsRequestFromExtension(request, extension_info_map);
+      IsRequestFromExtension(request, extension_info_map, browser_context);
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   // We are conservative here and assume requests are asynchronous in case
   // we don't have an info object. We don't want to risk a deadlock.
   bool is_async_request = !info || info->IsAsync();
 
   EventListeners matching_listeners;
   GetMatchingListenersImpl(
       browser_context, request, extension_info_map, false, event_name,
       url, render_process_host_id, routing_id, resource_type,
@@ skipping 868 matching lines @@
   // Continue gracefully.
   RunSync();
 }
 
 bool WebRequestHandlerBehaviorChangedFunction::RunSync() {
   helpers::ClearCacheOnNavigation();
   return true;
 }
 
 }  // namespace extensions