Allow tabCapture API to be granted for chrome:// pages.

chrome/browser/extensions/api/tab_capture/tab_capture_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.
 
 // Implements the Chrome Extensions Tab Capture API.
 
 #include "chrome/browser/extensions/api/tab_capture/tab_capture_api.h"
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry_factory.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/extension_renderer_state.h"
-#include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/permissions/permissions_data.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
 
 using extensions::api::tab_capture::MediaStreamConstraint;
 
 namespace TabCapture = extensions::api::tab_capture;
 namespace GetCapturedTabs = TabCapture::GetCapturedTabs;
 
@@ skipping 33 matching lines @@
   content::WebContents* target_contents =
       target_browser->tab_strip_model()->GetActiveWebContents();
   if (!target_contents) {
     error_ = kFindingTabError;
     return false;
   }
 
   const Extension* extension = GetExtension();
   const std::string& extension_id = extension->id();
 
+  const int tab_id = SessionID::IdForTab(target_contents);
+
   // Make sure either we have been granted permission to capture through an
   // extension icon click or our extension is whitelisted.
-  if (!TabHelper::FromWebContents(target_contents)->
-          active_tab_permission_granter()->IsGranted(extension) &&
+  if (!PermissionsData::HasAPIPermissionForTab(
+          extension, tab_id, APIPermission::kTabCaptureForTab) &&
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kWhitelistedExtensionID) != extension_id &&
       !FeatureProvider::GetByName("permission")->GetFeature("tabCapture")->
           IsIdInWhitelist(extension_id)) {
     error_ = kGrantError;
     return false;
   }
 
   content::RenderViewHost* const rvh = target_contents->GetRenderViewHost();
   int render_process_id = rvh->GetProcess()->GetID();
   int routing_id = rvh->GetRoutingID();
-  int tab_id = SessionTabHelper::FromWebContents(target_contents)->
-                   session_id().id();
 
   // Create a constraints vector. We will modify all the constraints in this
   // vector to append our chrome specific constraints.
   std::vector<MediaStreamConstraint*> constraints;
   bool has_audio = params->options.audio.get() && *params->options.audio.get();
   bool has_video = params->options.video.get() && *params->options.video.get();
 
   if (!has_audio && !has_video) {
     error_ = kNoAudioOrVideo;
     return false;
@@ skipping 59 matching lines @@
     info->tab_id = it->first;
     info->status = it->second;
     list->Append(info->ToValue().release());
   }
 
   SetResult(list);
   return true;
 }
 
 }  // namespace extensions