[Extensions] Use document url (not top url) for tab-specific permissions

chrome/browser/extensions/active_tab_unittest.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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
@@ skipping 90 matching lines @@
                  PermittedFeature feature) {
     return IsAllowed(extension, url, feature, tab_id());
   }
 
   bool IsAllowed(const scoped_refptr<const Extension>& extension,
                  const GURL& url,
                  PermittedFeature feature,
                  int tab_id) {
     const PermissionsData* permissions_data = extension->permissions_data();
     bool script = permissions_data->CanAccessPage(
-        extension.get(), url, url, tab_id, -1, NULL);
+        extension.get(), url, tab_id, -1, NULL);
     bool capture = HasTabsPermission(extension, tab_id) &&
                    permissions_data->CanCaptureVisiblePage(tab_id, NULL);
     switch (feature) {
       case PERMITTED_SCRIPT_ONLY:
         return script && !capture;
       case PERMITTED_CAPTURE_ONLY:
         return capture && !script;
       case PERMITTED_BOTH:
         return script && capture;
       case PERMITTED_NONE:
@@ skipping 147 matching lines @@
   active_tab_permission_granter()->GrantIfRequested(
       extension_without_active_tab.get());
 
   EXPECT_TRUE(IsAllowed(extension, google));
   EXPECT_TRUE(IsAllowed(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
 
   EXPECT_TRUE(IsAllowed(extension, chromium, PERMITTED_CAPTURE_ONLY));
   EXPECT_TRUE(IsAllowed(another_extension, chromium, PERMITTED_CAPTURE_ONLY));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, chromium));
-};
+}
 
 TEST_F(ActiveTabTest, Uninstalling) {
   // Some semi-arbitrary setup.
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   active_tab_permission_granter()->GrantIfRequested(extension.get());
 
   EXPECT_TRUE(IsGrantedForTab(extension.get(), web_contents()));
   EXPECT_TRUE(IsAllowed(extension, google));
@@ skipping 82 matching lines @@
   EXPECT_TRUE(permissions_data->HasAPIPermissionForTab(
       tab_id(), APIPermission::kTabCaptureForTab));
 
   EXPECT_TRUE(IsBlocked(extension_with_tab_capture, internal, tab_id() + 1));
   EXPECT_FALSE(permissions_data->HasAPIPermissionForTab(
       tab_id() + 1, APIPermission::kTabCaptureForTab));
 }
 
 }  // namespace
 }  // namespace extensions