Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11046)

Unified Diff: chrome/browser/extensions/active_script_controller_unittest.cc

Issue 597413003: Introduce an "ExtensionWantsToAct" method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master for CQ Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/active_script_controller_unittest.cc
diff --git a/chrome/browser/extensions/active_script_controller_unittest.cc b/chrome/browser/extensions/active_script_controller_unittest.cc
index a2a95739d12fdd90e521509aae4ca85dcdd0bde6..20acc0de48ec388726b6ae47b1df1e4e0dfe5fbc 100644
--- a/chrome/browser/extensions/active_script_controller_unittest.cc
+++ b/chrome/browser/extensions/active_script_controller_unittest.cc
@@ -7,6 +7,7 @@
#include "base/values.h"
#include "chrome/browser/extensions/active_script_controller.h"
#include "chrome/browser/extensions/active_tab_permission_granter.h"
+#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "chrome/browser/extensions/tab_helper.h"
@@ -182,6 +183,11 @@ TEST_F(ActiveScriptControllerUnitTest, RequestPermissionAndExecute) {
ASSERT_EQ(0u, GetExecutionCountForExtension(extension->id()));
ASSERT_FALSE(controller()->WantsToRun(extension));
+ ExtensionActionAPI* extension_action_api =
+ ExtensionActionAPI::Get(profile());
+ ASSERT_FALSE(extension_action_api->ExtensionWantsToRun(extension,
+ web_contents()));
+
// Since the extension requests all_hosts, we should require user consent.
EXPECT_TRUE(RequiresUserConsent(extension));
@@ -189,6 +195,8 @@ TEST_F(ActiveScriptControllerUnitTest, RequestPermissionAndExecute) {
// executed.
RequestInjection(extension);
EXPECT_TRUE(controller()->WantsToRun(extension));
+ EXPECT_TRUE(extension_action_api->ExtensionWantsToRun(extension,
+ web_contents()));
EXPECT_EQ(0u, GetExecutionCountForExtension(extension->id()));
// Click to accept the extension executing.
@@ -197,6 +205,8 @@ TEST_F(ActiveScriptControllerUnitTest, RequestPermissionAndExecute) {
// The extension should execute, and the extension shouldn't want to run.
EXPECT_EQ(1u, GetExecutionCountForExtension(extension->id()));
EXPECT_FALSE(controller()->WantsToRun(extension));
+ EXPECT_FALSE(extension_action_api->ExtensionWantsToRun(extension,
+ web_contents()));
// Since we already executed on the given page, we shouldn't need permission
// for a second time.

Powered by Google App Engine
This is Rietveld 408576698