[MD Bookmarks] Double Click

chrome/browser/extensions/extension_tab_util.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 "chrome/browser/extensions/extension_tab_util.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 423 matching lines @@
           new std::string(chrome::GetExtensionIdForMutedTab(contents)));
       break;
   }
   return info;
 }
 
 // static
 void ExtensionTabUtil::ScrubTabForExtension(const Extension* extension,
                                             content::WebContents* contents,
                                             api::tabs::Tab* tab) {
-  DCHECK(extension);
-
-  bool api_permission = false;
-  std::string url;
-  if (contents) {
-    api_permission = extension->permissions_data()->HasAPIPermissionForTab(
-        GetTabId(contents), APIPermission::kTab);
-    url = contents->GetURL().spec();
-  } else {
-    api_permission =
-        extension->permissions_data()->HasAPIPermission(APIPermission::kTab);
-    url = *tab->url;
+  bool has_permission = false;
+  if (extension) {

[benwells, 2017/02/07 07:13:07]

It looks like this change is just making it so this function can be called with
a null extension, and do nothing (but not DCHECK). Is that right? If so can you
just do something like

if (!extension)
  return;

at the beginning?

[jiaxi, 2017/02/08 00:04:00]

This function removes privacy sensitive fields if the extension and tab do not
have the appropriate permissions. No knowing what any of this does, it seems
safer to scrub this data for null extensions than the alternative.

[benwells, 2017/02/08 00:36:15]

Ah right, it isn't equivalent to that snippet I put in.

+    bool api_permission = false;
+    std::string url;
+    if (contents) {
+      api_permission = extension->permissions_data()->HasAPIPermissionForTab(
+          GetTabId(contents), APIPermission::kTab);
+      url = contents->GetURL().spec();
+    } else {
+      api_permission =
+          extension->permissions_data()->HasAPIPermission(APIPermission::kTab);
+      url = *tab->url;
+    }
+    bool host_permission = extension->permissions_data()
+                               ->active_permissions()
+                               .HasExplicitAccessToOrigin(GURL(url));
+    has_permission = api_permission || host_permission;
   }
-  bool host_permission = extension->permissions_data()
-                             ->active_permissions()
-                             .HasExplicitAccessToOrigin(GURL(url));
-  bool has_permission = api_permission || host_permission;
   if (!has_permission) {
     tab->url.reset();
     tab->title.reset();
     tab->fav_icon_url.reset();
   }
 }
 
 bool ExtensionTabUtil::GetTabStripModel(const WebContents* web_contents,
                                         TabStripModel** tab_strip_model,
                                         int* tab_index) {
@@ skipping 195 matching lines @@
   chrome::ShowSingletonTabOverwritingNTP(browser, params);
   return true;
 }
 
 // static
 bool ExtensionTabUtil::BrowserSupportsTabs(Browser* browser) {
   return browser && browser->tab_strip_model() && !browser->is_devtools();
 }
 
 }  // namespace extensions