[Extensions] Refactor extension action execution

chrome/browser/extensions/location_bar_controller_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 <utility>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 51 matching lines @@
 #if defined OS_CHROMEOS
     test_user_manager_.reset();
 #endif
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   int tab_id() {
     return SessionTabHelper::IdForTab(web_contents());
   }
 
+  bool PageActionWantsToRun(const Extension* extension) {
+    ExtensionAction* page_action =
+        ExtensionActionManager::Get(profile())->GetPageAction(*extension);
+    return page_action && page_action->GetIsVisible(tab_id());
+  }
+
   const Extension* AddExtension(bool has_page_actions,
                                 const std::string& name) {
     DictionaryBuilder manifest;
     manifest.Set("name", name)
         .Set("version", "1.0.0")
         .Set("manifest_version", 2)
         .Set("permissions", ListBuilder().Append("tabs").Build());
     if (has_page_actions) {
       manifest.Set("page_action",
                    DictionaryBuilder().Set("default_title", "Hello").Build());
@@ skipping 79 matching lines @@
 TEST_F(LocationBarControllerUnitTest, NavigationClearsState) {
   const Extension* extension = AddExtension(true, "page_actions");
 
   NavigateAndCommit(GURL("http://www.google.com"));
 
   ExtensionAction& page_action =
       *ExtensionActionManager::Get(profile())->GetPageAction(*extension);
   page_action.SetTitle(tab_id(), "Goodbye");
   page_action.SetPopupUrl(tab_id(), extension->GetResourceURL("popup.html"));
 
-  ExtensionActionAPI* extension_action_api =
-      ExtensionActionAPI::Get(profile());
   // By default, extensions shouldn't want to act on a page.
-  EXPECT_FALSE(
-      extension_action_api->PageActionWantsToRun(extension, web_contents()));
+  EXPECT_FALSE(PageActionWantsToRun(extension));
   // Showing the page action should indicate that an extension *does* want to
   // run on the page.
   page_action.SetIsVisible(tab_id(), true);
-  EXPECT_TRUE(
-      extension_action_api->PageActionWantsToRun(extension, web_contents()));
+  EXPECT_TRUE(PageActionWantsToRun(extension));
 
   EXPECT_EQ("Goodbye", page_action.GetTitle(tab_id()));
   EXPECT_EQ(extension->GetResourceURL("popup.html"),
             page_action.GetPopupUrl(tab_id()));
 
   // Within-page navigation should keep the settings.
   NavigateAndCommit(GURL("http://www.google.com/#hash"));
 
   EXPECT_EQ("Goodbye", page_action.GetTitle(tab_id()));
   EXPECT_EQ(extension->GetResourceURL("popup.html"),
             page_action.GetPopupUrl(tab_id()));
-  EXPECT_TRUE(
-      extension_action_api->PageActionWantsToRun(extension, web_contents()));
+  EXPECT_TRUE(PageActionWantsToRun(extension));
 
   // Should discard the settings, and go back to the defaults.
   NavigateAndCommit(GURL("http://www.yahoo.com"));
 
   EXPECT_EQ("Hello", page_action.GetTitle(tab_id()));
   EXPECT_EQ(GURL(), page_action.GetPopupUrl(tab_id()));
-  EXPECT_FALSE(
-      extension_action_api->PageActionWantsToRun(extension, web_contents()));
+  EXPECT_FALSE(PageActionWantsToRun(extension));
 }
 
 }  // namespace
 }  // namespace extensions