Make extension commands grant the activeTab permission.

chrome/browser/extensions/extension_keybinding_apitest.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/active_tab_permission_granter.h"
+#include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/browser_action_test_util.h"
+#include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 
 using content::WebContents;
 
+namespace extensions {
+
 class CommandsApiTest : public ExtensionApiTest {
  public:
   CommandsApiTest() {}
   virtual ~CommandsApiTest() {}
 
  protected:
   BrowserActionTestUtil GetBrowserActionsBar() {
     return BrowserActionTestUtil(browser());
   }
 };
@@ skipping 13 matching lines @@
 
 // Test the basic functionality of the Keybinding API:
 // - That pressing the shortcut keys should perform actions (activate the
 //   browser action or send an event).
 // - Note: Page action keybindings are tested in PageAction test below.
 // - The shortcut keys taken by one extension are not overwritten by the last
 //   installed extension.
 IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("keybinding/basics")) << message_;
-  const extensions::Extension* extension = GetSingleLoadedExtension();
+  const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // Load this extension, which uses the same keybindings but sets the page
   // to different colors. This is so we can see that it doesn't interfere. We
   // don't test this extension in any other way (it should otherwise be
   // immaterial to this test).
   ASSERT_TRUE(RunExtensionTest("keybinding/conflicting")) << message_;
 
   // Test that there are two browser actions in the toolbar.
   ASSERT_EQ(2, GetBrowserActionsBar().NumberOfBrowserActions());
 
   ui_test_utils::NavigateToURL(browser(),
       test_server()->GetURL("files/extensions/test_file.txt"));
 
+  // activeTab shouldn't have been granted yet.
+  TabContents* tab = chrome::GetActiveTabContents(browser());
+  ASSERT_TRUE(tab);
+
+  ActiveTabPermissionGranter* granter =
+      TabHelper::FromWebContents(tab->web_contents())->
+          active_tab_permission_granter();
+  EXPECT_FALSE(granter->IsGranted(extension));
+
   // Activate the shortcut (Ctrl+Shift+F).
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_F, true, true, false, false));
 
+  // activeTab should now be granted.
+  EXPECT_TRUE(granter->IsGranted(extension));
+
   // Verify the command worked.
-  WebContents* tab = chrome::GetActiveWebContents(browser());
   bool result = false;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), L"",
+      tab->web_contents()->GetRenderViewHost(), L"",
       L"setInterval(function(){"
       L"  if(document.body.bgColor == 'red'){"
       L"    window.domAutomationController.send(true)}}, 100)",
       &result));
   ASSERT_TRUE(result);
 
   // Activate the shortcut (Ctrl+Shift+Y).
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_Y, true, true, false, false));
 
   result = false;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      tab->GetRenderViewHost(), L"",
+      tab->web_contents()->GetRenderViewHost(), L"",
       L"setInterval(function(){"
       L"  if(document.body.bgColor == 'blue'){"
       L"    window.domAutomationController.send(true)}}, 100)",
       &result));
   ASSERT_TRUE(result);
 }
 
 IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageAction) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("keybinding/page_action")) << message_;
-  const extensions::Extension* extension = GetSingleLoadedExtension();
+  const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   {
     // Load a page, the extension will detect the navigation and request to show
     // the page action icon.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         test_server()->GetURL("files/extensions/test_file.txt"));
     ASSERT_TRUE(catcher.GetNextResult());
   }
@@ skipping 25 matching lines @@
 // Checked-in in a disabled state, because the necessary functionality to
 // automatically verify that the test works hasn't been implemented for the
 // script badges yet (see http://crbug.com/140016). The test results, can be
 // verified manually by running the test and verifying that the synthesized
 // popup for script badges appear. When bug 140016 has been fixed, the popup
 // code can signal to the test that the test passed.
 // TODO(finnur): Enable this test once the bug is fixed.
 IN_PROC_BROWSER_TEST_F(ScriptBadgesCommandsApiTest, ScriptBadge_DISABLED) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("keybinding/script_badge")) << message_;
-  const extensions::Extension* extension = GetSingleLoadedExtension();
+  const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   {
     ResultCatcher catcher;
     // Tell the extension to update the script badge state.
     ui_test_utils::NavigateToURL(
         browser(), GURL(extension->GetResourceURL("show.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   {
     ResultCatcher catcher;
     // Activate the shortcut (Ctrl+Shift+F).
     ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
         browser(), ui::VKEY_F, true, true, false, false));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 }
 
+}  // extensions