Uncouple ActiveScriptController from LocationBarController

chrome/browser/extensions/active_script_controller_unittest.cc

 // Copyright 2014 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 <map>
 
 #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/extension_util.h"
@@ skipping 146 matching lines @@
 void ActiveScriptControllerUnitTest::IncrementExecutionCount(
     const std::string& extension_id) {
   ++extension_executions_[extension_id];
 }
 
 void ActiveScriptControllerUnitTest::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
 
   TabHelper::CreateForWebContents(web_contents());
   TabHelper* tab_helper = TabHelper::FromWebContents(web_contents());
-  // None of these should ever be NULL.
+  // These should never be NULL.
   DCHECK(tab_helper);
-  DCHECK(tab_helper->location_bar_controller());
-  active_script_controller_ =
-      tab_helper->location_bar_controller()->active_script_controller();
+  active_script_controller_ = tab_helper->active_script_controller();
   DCHECK(active_script_controller_);
 }
 
 // Test that extensions with all_hosts require permission to execute, and, once
 // that permission is granted, do execute.
 TEST_F(ActiveScriptControllerUnitTest, RequestPermissionAndExecute) {
   const Extension* extension = AddExtension();
   ASSERT_TRUE(extension);
 
   NavigateAndCommit(GURL("https://www.google.com"));
 
   // Ensure that there aren't any executions pending.
   ASSERT_EQ(0u, GetExecutionCountForExtension(extension->id()));
-  ASSERT_FALSE(controller()->GetActionForExtension(extension));
+  ASSERT_FALSE(controller()->WantsToRun(extension));
 
   // Since the extension requests all_hosts, we should require user consent.
   EXPECT_TRUE(RequiresUserConsent(extension));
 
-  // Request an injection. There should be an action visible, but no executions.
+  // Request an injection. The extension should want to run, but should not have
+  // executed.
   RequestInjection(extension);
-  EXPECT_TRUE(controller()->GetActionForExtension(extension));
+  EXPECT_TRUE(controller()->WantsToRun(extension));
   EXPECT_EQ(0u, GetExecutionCountForExtension(extension->id()));
 
   // Click to accept the extension executing.
   controller()->OnClicked(extension);
 
-  // The extension should execute, and the action should go away.
+  // The extension should execute, and the extension shouldn't want to run.
   EXPECT_EQ(1u, GetExecutionCountForExtension(extension->id()));
-  EXPECT_FALSE(controller()->GetActionForExtension(extension));
+  EXPECT_FALSE(controller()->WantsToRun(extension));
 
   // Since we already executed on the given page, we shouldn't need permission
   // for a second time.
   EXPECT_FALSE(RequiresUserConsent(extension));
 
   // Reloading and same-origin navigations shouldn't clear those permissions,
   // and we shouldn't require user constent again.
   Reload();
   EXPECT_FALSE(RequiresUserConsent(extension));
   NavigateAndCommit(GURL("https://www.google.com/foo"));
   EXPECT_FALSE(RequiresUserConsent(extension));
   NavigateAndCommit(GURL("https://www.google.com/bar"));
   EXPECT_FALSE(RequiresUserConsent(extension));
 
   // Cross-origin navigations should clear permissions.
   NavigateAndCommit(GURL("https://otherdomain.google.com"));
   EXPECT_TRUE(RequiresUserConsent(extension));
 
   // Grant access.
   RequestInjection(extension);
   controller()->OnClicked(extension);
   EXPECT_EQ(2u, GetExecutionCountForExtension(extension->id()));
-  EXPECT_FALSE(controller()->GetActionForExtension(extension));
+  EXPECT_FALSE(controller()->WantsToRun(extension));
 
   // Navigating to another site should also clear the permissions.
   NavigateAndCommit(GURL("https://www.foo.com"));
   EXPECT_TRUE(RequiresUserConsent(extension));
 }
 
 // Test that injections that are not executed by the time the user navigates are
 // ignored and never execute.
 TEST_F(ActiveScriptControllerUnitTest, PendingInjectionsRemovedAtNavigation) {
   const Extension* extension = AddExtension();
   ASSERT_TRUE(extension);
 
   NavigateAndCommit(GURL("https://www.google.com"));
 
   ASSERT_EQ(0u, GetExecutionCountForExtension(extension->id()));
 
-  // Request an injection. There should be an action visible, but no executions.
+  // Request an injection. The extension should want to run, but not execute.
   RequestInjection(extension);
-  EXPECT_TRUE(controller()->GetActionForExtension(extension));
+  EXPECT_TRUE(controller()->WantsToRun(extension));
   EXPECT_EQ(0u, GetExecutionCountForExtension(extension->id()));
 
   // Reload. This should remove the pending injection, and we should not
   // execute anything.
   Reload();
-  EXPECT_FALSE(controller()->GetActionForExtension(extension));
+  EXPECT_FALSE(controller()->WantsToRun(extension));
   EXPECT_EQ(0u, GetExecutionCountForExtension(extension->id()));
 
   // Request and accept a new injection.
   RequestInjection(extension);
   controller()->OnClicked(extension);
 
   // The extension should only have executed once, even though a grand total
   // of two executions were requested.
   EXPECT_EQ(1u, GetExecutionCountForExtension(extension->id()));
-  EXPECT_FALSE(controller()->GetActionForExtension(extension));
+  EXPECT_FALSE(controller()->WantsToRun(extension));
 }
 
 // Test that queueing multiple pending injections, and then accepting, triggers
 // them all.
 TEST_F(ActiveScriptControllerUnitTest, MultiplePendingInjection) {
   const Extension* extension = AddExtension();
   ASSERT_TRUE(extension);
   NavigateAndCommit(GURL("https://www.google.com"));
 
   ASSERT_EQ(0u, GetExecutionCountForExtension(extension->id()));
 
   const size_t kNumInjections = 3u;
   // Queue multiple pending injections.
   for (size_t i = 0u; i < kNumInjections; ++i)
     RequestInjection(extension);
 
   EXPECT_EQ(0u, GetExecutionCountForExtension(extension->id()));
 
   controller()->OnClicked(extension);
 
   // All pending injections should have executed.
   EXPECT_EQ(kNumInjections, GetExecutionCountForExtension(extension->id()));
-  EXPECT_FALSE(controller()->GetActionForExtension(extension));
+  EXPECT_FALSE(controller()->WantsToRun(extension));
 }
 
 TEST_F(ActiveScriptControllerUnitTest, ActiveScriptsUseActiveTabPermissions) {
   const Extension* extension = AddExtension();
   NavigateAndCommit(GURL("https://www.google.com"));
 
   ActiveTabPermissionGranter* active_tab_permission_granter =
       TabHelper::FromWebContents(web_contents())
           ->active_tab_permission_granter();
   ASSERT_TRUE(active_tab_permission_granter);
@@ skipping 16 matching lines @@
 
   // Navigating to a different origin will require user consent again.
   NavigateAndCommit(GURL("https://yahoo.com"));
   EXPECT_TRUE(RequiresUserConsent(extension));
 
   // Back to the original origin should also re-require constent.
   NavigateAndCommit(GURL("https://www.google.com"));
   EXPECT_TRUE(RequiresUserConsent(extension));
 
   RequestInjection(extension);
-  EXPECT_TRUE(controller()->GetActionForExtension(extension));
+  EXPECT_TRUE(controller()->WantsToRun(extension));
   EXPECT_EQ(0u, GetExecutionCountForExtension(extension->id()));
 
   // Grant active tab.
   active_tab_permission_granter->GrantIfRequested(extension);
 
   // The pending injections should have run since active tab permission was
   // granted.
   EXPECT_EQ(1u, GetExecutionCountForExtension(extension->id()));
-  EXPECT_FALSE(controller()->GetActionForExtension(extension));
+  EXPECT_FALSE(controller()->WantsToRun(extension));
 }
 
 TEST_F(ActiveScriptControllerUnitTest, ActiveScriptsCanHaveAllUrlsPref) {
   const Extension* extension = AddExtension();
   ASSERT_TRUE(extension);
 
   NavigateAndCommit(GURL("https://www.google.com"));
   EXPECT_TRUE(RequiresUserConsent(extension));
 
   // Enable the extension on all urls.
@@ skipping 14 matching lines @@
 }
 
 TEST_F(ActiveScriptControllerUnitTest, TestAlwaysRun) {
   const Extension* extension = AddExtension();
   ASSERT_TRUE(extension);
 
   NavigateAndCommit(GURL("https://www.google.com/?gws_rd=ssl"));
 
   // Ensure that there aren't any executions pending.
   ASSERT_EQ(0u, GetExecutionCountForExtension(extension->id()));
-  ASSERT_FALSE(controller()->GetActionForExtension(extension));
+  ASSERT_FALSE(controller()->WantsToRun(extension));
 
   // Since the extension requests all_hosts, we should require user consent.
   EXPECT_TRUE(RequiresUserConsent(extension));
 
-  // Request an injection. There should be an action visible, but no executions.
+  // Request an injection. The extension should want to run, but not execute.
   RequestInjection(extension);
-  EXPECT_TRUE(controller()->GetActionForExtension(extension));
+  EXPECT_TRUE(controller()->WantsToRun(extension));
   EXPECT_EQ(0u, GetExecutionCountForExtension(extension->id()));
 
   // Allow the extension to always run on this origin.
   controller()->AlwaysRunOnVisibleOrigin(extension);
 
-  // The extension should execute, and the action should go away.
+  // The extension should execute, and the extension shouldn't want to run.
   EXPECT_EQ(1u, GetExecutionCountForExtension(extension->id()));
-  EXPECT_FALSE(controller()->GetActionForExtension(extension));
+  EXPECT_FALSE(controller()->WantsToRun(extension));
 
   // Since we already executed on the given page, we shouldn't need permission
   // for a second time.
   EXPECT_FALSE(RequiresUserConsent(extension));
 
   // Navigating to another site that hasn't been granted a persisted permission
   // should necessitate user consent.
   NavigateAndCommit(GURL("https://www.foo.com/bar"));
   EXPECT_TRUE(RequiresUserConsent(extension));
 
@@ skipping 14 matching lines @@
   EXPECT_TRUE(RequiresUserConsent(extension));
   // Different subdomain...
   NavigateAndCommit(GURL("https://en.google.com/foo/bar"));
   EXPECT_TRUE(RequiresUserConsent(extension));
   // Only the "always run" origin should be allowed to run without user consent.
   NavigateAndCommit(GURL("https://www.google.com/foo/bar"));
   EXPECT_FALSE(RequiresUserConsent(extension));
 }
 
 }  // namespace extensions