[Extensions] Show a "refresh" bubble when needed with click-to-script

chrome/browser/extensions/extension_action_runner_browsertest.cc

Index: chrome/browser/extensions/extension_action_runner_browsertest.cc
diff --git a/chrome/browser/extensions/extension_action_runner_browsertest.cc b/chrome/browser/extensions/extension_action_runner_browsertest.cc
index f55091dc97e506f1c61f4bfc0bbe6df3549e2bed..f9b28e112267c491fdf808e64a0512abcaa84d72 100644
--- a/chrome/browser/extensions/extension_action_runner_browsertest.cc
+++ b/chrome/browser/extensions/extension_action_runner_browsertest.cc
@@ -20,6 +20,8 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/switches.h"
@@ -63,6 +65,22 @@ bool RunAllPendingInRenderer(content::WebContents* web_contents) {
   return content::ExecuteScript(web_contents, "1 == 1;");
 }
 
+// For use with blocked actions browsertests that put the result in
+// window.localStorage. Returns the result or "undefined" if the result is not
+// set.
+std::string GetValue(content::WebContents* web_contents) {
+  std::string out;
+  if (!content::ExecuteScriptAndExtractString(
+          web_contents,
+          "var res = window.localStorage.getItem('extResult') || 'undefined';"
+          "window.localStorage.removeItem('extResult');"
+          "window.domAutomationController.send(res);",
+          &out)) {
+    out = "Failed to inject script";
+  }
+  return out;
+}
+
 }  // namespace
 
 class ExtensionActionRunnerBrowserTest : public ExtensionBrowserTest {
@@ -119,7 +137,7 @@ const Extension* ExtensionActionRunnerBrowserTest::CreateExtension(
         " {"
         "  \"matches\": [\"%s\"],"
         "  \"js\": [\"script.js\"],"
-        "  \"run_at\": \"document_start\""
+        "  \"run_at\": \"document_end\""
         " }"
         "]",
         permission_scheme);
@@ -427,6 +445,93 @@ IN_PROC_BROWSER_TEST_F(ExtensionActionRunnerBrowserTest,
   EXPECT_FALSE(inject_success_listener.was_satisfied());
 }
 
+IN_PROC_BROWSER_TEST_F(ExtensionActionRunnerBrowserTest,
+                       BlockedActionBrowserTest) {
+  // Load an extension that wants to run on every page at document start, and
+  // load a test page.
+  ASSERT_TRUE(embedded_test_server()->Start());
+  const GURL kUrl = embedded_test_server()->GetURL("/simple.html");

[asargent_no_longer_on_chrome, 2016/03/21 23:31:15]

optional: it seems a little unusual to use the "k" prefix for a local variable;
usually I expect to look up at the top of a file or in some include file for
variables named like that. Consider modifying. 

[Devlin, 2016/03/23 21:48:46]

I know we do it elsewhere, but I'm not sure if there's a sane rule.  Happy to
change it, though, so done.

+  const Extension* extension = LoadExtension(
+      test_data_dir_.AppendASCII("blocked_actions/content_scripts"));
+  ASSERT_TRUE(extension);
+  ui_test_utils::NavigateToURL(browser(), kUrl);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_TRUE(content::WaitForLoadStop(web_contents));
+
+  // The extension should want to run on the page, and should not have
+  // injected.
+  ExtensionActionRunner* runner =
+      ExtensionActionRunner::GetForWebContents(web_contents);
+  ASSERT_TRUE(runner);
+  EXPECT_TRUE(runner->WantsToRun(extension));
+  EXPECT_EQ("undefined", GetValue(web_contents));
+
+  // Wire up the runner to automatically accept the bubble to prompt for page
+  // refresh.
+  runner->set_default_bubble_close_action_for_testing(
+      make_scoped_ptr(new ToolbarActionsBarBubbleDelegate::CloseAction(
+          ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE)));
+
+  content::NavigationEntry* entry =
+      web_contents->GetController().GetLastCommittedEntry();
+  ASSERT_TRUE(entry);
+  const int first_nav_id = entry->GetUniqueID();
+
+  // Run the extension action, which should cause a page refresh (since we
+  // automatically accepted the bubble prompting us), and the extension should
+  // have injected at document start.
+  runner->RunAction(extension, true);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(content::WaitForLoadStop(web_contents));
+  entry = web_contents->GetController().GetLastCommittedEntry();
+  ASSERT_TRUE(entry);
+  // Confirm that we refreshed the page.
+  EXPECT_GE(entry->GetUniqueID(), first_nav_id);
+  EXPECT_EQ("success", GetValue(web_contents));
+  EXPECT_FALSE(runner->WantsToRun(extension));
+
+  // Revoke permission and reload to try different bubble options.
+  ActiveTabPermissionGranter* active_tab_granter =
+      TabHelper::FromWebContents(web_contents)->active_tab_permission_granter();
+  ASSERT_TRUE(active_tab_granter);
+  active_tab_granter->RevokeForTesting();
+  web_contents->GetController().Reload(true);
+  EXPECT_TRUE(content::WaitForLoadStop(web_contents));
+
+  // The extension should again want to run. Automatically dismiss the bubble
+  // that pops up prompting for page refresh.
+  EXPECT_TRUE(runner->WantsToRun(extension));
+  EXPECT_EQ("undefined", GetValue(web_contents));
+  const int next_nav_id =
+      web_contents->GetController().GetLastCommittedEntry()->GetUniqueID();
+  runner->set_default_bubble_close_action_for_testing(
+      make_scoped_ptr(new ToolbarActionsBarBubbleDelegate::CloseAction(
+          ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION)));
+
+  // Try running the extension. Nothing should happen, because the user
+  // didn't agree to refresh the page. The extension should still want to run.
+  runner->RunAction(extension, true);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(content::WaitForLoadStop(web_contents));
+  EXPECT_EQ("undefined", GetValue(web_contents));
+  EXPECT_EQ(
+      next_nav_id,
+      web_contents->GetController().GetLastCommittedEntry()->GetUniqueID());
+
+  // Repeat with a dismissal from bubble deactivation - same story.
+  runner->set_default_bubble_close_action_for_testing(
+      make_scoped_ptr(new ToolbarActionsBarBubbleDelegate::CloseAction(
+          ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION)));
+  runner->RunAction(extension, true);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(content::WaitForLoadStop(web_contents));
+  EXPECT_EQ("undefined", GetValue(web_contents));
+  EXPECT_EQ(
+      next_nav_id,
+      web_contents->GetController().GetLastCommittedEntry()->GetUniqueID());
+}
+
 // A version of the test with the flag off, in order to test that everything
 // still works as expected.
 class FlagOffExtensionActionRunnerBrowserTest