Fix BrowserActionApiTest.DynamicBrowserAction interaction with dev-mode highlighting.

chrome/browser/extensions/api/extension_action/browser_action_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 "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
+#include "chrome/browser/extensions/dev_mode_bubble_controller.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.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"
 #include "extensions/browser/extension_system.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 
 using content::WebContents;
 
 namespace extensions {
 namespace {
 
 const char kEmptyImageDataError[] =
     "The imageData property must contain an ImageData object or dictionary "
     "of ImageData objects.";
 const char kEmptyPathError[] = "The path property must not be empty.";
 
-// Views implementation of browser action button will return icon whose
-// background will be set.
-gfx::ImageSkia AddBackgroundForViews(const gfx::ImageSkia& icon) {
-#if defined(TOOLKIT_VIEWS)
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia bg = *rb.GetImageSkiaNamed(IDR_BROWSER_ACTION);
-  return gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon);
-#endif
-
-  return icon;
-}
-
 bool ImagesAreEqualAtScale(const gfx::ImageSkia& i1,
                            const gfx::ImageSkia& i2,
                            float scale) {
   SkBitmap bitmap1 = i1.GetRepresentation(scale).sk_bitmap();
   SkBitmap bitmap2 = i2.GetRepresentation(scale).sk_bitmap();
   return gfx::BitmapsAreEqual(bitmap1, bitmap2);
 }
 
 class BrowserActionApiTest : public ExtensionApiTest {
  public:
@@ skipping 13 matching lines @@
     GetBrowserActionsBar().Press(index);
     popup_observer.Wait();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
     return GetBrowserActionsBar().HasPopup();
   }
 
   ExtensionAction* GetBrowserAction(const Extension& extension) {
     return ExtensionActionManager::Get(browser()->profile())->
         GetBrowserAction(extension);
   }
+
+  // Views implementation of browser action button will return icon whose
+  // background will be set.
+  gfx::ImageSkia AddBackgroundForViews(const gfx::ImageSkia& icon) {
+#if defined(TOOLKIT_VIEWS)
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    gfx::ImageSkia bg = *rb.GetImageSkiaNamed(IDR_BROWSER_ACTION);
+    // We may have a different background than the default - see
+    // BrowserActionButton::UpdateState.
+    if (extensions::DevModeBubbleController::IsDevModeExtension(extension_))

[Jeffrey Yasskin, 2014/02/19 01:13:34]

Can we pass this extension as a function argument rather than implicitly through
the class?

+      bg = *rb.GetImageSkiaNamed(IDR_BROWSER_ACTION_HIGHLIGHT);
+    return gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon);
+#endif
+
+    return icon;
+  }
+
+  const Extension* extension_;
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension_) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
 
   // Tell the extension to update the browser action state.
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
-      GURL(extension->GetResourceURL("update.html")));
+                               GURL(extension_->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   // Test that we received the changes.
-  ExtensionAction* action = GetBrowserAction(*extension);
+  ExtensionAction* action = GetBrowserAction(*extension_);
   ASSERT_EQ("Modified", action->GetTitle(ExtensionAction::kDefaultTabId));
   ASSERT_EQ("badge", action->GetBadgeText(ExtensionAction::kDefaultTabId));
   ASSERT_EQ(SkColorSetARGB(255, 255, 255, 255),
             action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId));
 
   // Simulate the browser action being clicked.
   ui_test_utils::NavigateToURL(browser(),
       test_server()->GetURL("files/extensions/test_file.txt"));
 
   ExtensionToolbarModel* toolbar_model = ExtensionToolbarModel::Get(
       browser()->profile());
-  toolbar_model->ExecuteBrowserAction(extension, browser(), NULL, true);
+  toolbar_model->ExecuteBrowserAction(extension_, browser(), NULL, true);
 
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension_) << message_;
 
 #if defined (OS_MACOSX)
   // We need this on mac so we don't loose 2x representations from browser icon
   // in transformations gfx::ImageSkia -> NSImage -> gfx::ImageSkia.
   std::vector<ui::ScaleFactor> supported_scale_factors;
   supported_scale_factors.push_back(ui::SCALE_FACTOR_100P);
   supported_scale_factors.push_back(ui::SCALE_FACTOR_200P);
   ui::SetSupportedScaleFactors(supported_scale_factors);
 #endif
 
   // We should not be creating icons asynchronously, so we don't need an
   // observer.
   ExtensionActionIconFactory icon_factory(
-      profile(),
-      extension,
-      GetBrowserAction(*extension),
-      NULL);
+      profile(), extension_, GetBrowserAction(*extension_), NULL);
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
 
   gfx::Image action_icon = icon_factory.GetIcon(0);
   uint32_t action_icon_last_id = action_icon.ToSkBitmap()->getGenerationID();
 
   // Let's check that |GetIcon| doesn't always return bitmap with new id.
   ASSERT_EQ(action_icon_last_id,
             icon_factory.GetIcon(0).ToSkBitmap()->getGenerationID());
@@ skipping 142 matching lines @@
   GetBrowserActionsBar().Press(0);
   ASSERT_FALSE(catcher.GetNextResult());
   EXPECT_EQ(kEmptyPathError, catcher.message());
 }
 
 // This test is flaky as per http://crbug.com/74557.
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest,
                        DISABLED_TabSpecificBrowserActionState) {
   ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
       message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();

[Jeffrey Yasskin, 2014/02/19 01:13:34]

I don't think you have to make this change, since AddBackgroundForViews()
doesn't appear to be called in this test.

+  ASSERT_TRUE(extension_) << message_;
 
   // Test that there is a browser action in the toolbar and that it has an icon.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
 
   // Execute the action, its title should change.
   ResultCatcher catcher;
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
   EXPECT_EQ("Showing icon 2", GetBrowserActionsBar().GetTooltip(0));
 
   // Open a new tab, the title should go back.
   chrome::NewTab(browser());
   EXPECT_EQ("hi!", GetBrowserActionsBar().GetTooltip(0));
 
   // Go back to first tab, changed title should reappear.
   browser()->tab_strip_model()->ActivateTabAt(0, true);
   EXPECT_EQ("Showing icon 2", GetBrowserActionsBar().GetTooltip(0));
 
   // Reload that tab, default title should come back.
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
   EXPECT_EQ("hi!", GetBrowserActionsBar().GetTooltip(0));
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=70829
 // Mac used to be ok, but then mac 10.5 started failing too. =(
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DISABLED_BrowserActionPopup) {
-  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
-      "browser_action/popup")));
+  extension_ =
+      LoadExtension(test_data_dir_.AppendASCII("browser_action/popup"));
+  ASSERT_TRUE(extension_) << message_;
   BrowserActionTestUtil actions_bar = GetBrowserActionsBar();
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
 
   // The extension's popup's size grows by |growFactor| each click.
   const int growFactor = 500;
   gfx::Size minSize = BrowserActionTestUtil::GetMinPopupSize();
   gfx::Size middleSize = gfx::Size(growFactor, growFactor);
   gfx::Size maxSize = BrowserActionTestUtil::GetMaxPopupSize();
 
   // Ensure that two clicks will exceed the maximum allowed size.
   ASSERT_GT(minSize.height() + growFactor * 2, maxSize.height());
   ASSERT_GT(minSize.width() + growFactor * 2, maxSize.width());
@@ skipping 11 matching lines @@
   // One more time, but this time it should be constrained by the max values.
   ASSERT_TRUE(OpenPopup(0));
   EXPECT_EQ(maxSize, actions_bar.GetPopupBounds().size());
   EXPECT_TRUE(actions_bar.HidePopup());
 }
 
 // Test that calling chrome.browserAction.setPopup() can enable and change
 // a popup.
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) {
   ASSERT_TRUE(RunExtensionTest("browser_action/add_popup")) << message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension_) << message_;
 
   int tab_id = ExtensionTabUtil::GetTabId(
       browser()->tab_strip_model()->GetActiveWebContents());
 
-  ExtensionAction* browser_action = GetBrowserAction(*extension);
+  ExtensionAction* browser_action = GetBrowserAction(*extension_);
   ASSERT_TRUE(browser_action)
       << "Browser action test extension should have a browser action.";
 
   ASSERT_FALSE(browser_action->HasPopup(tab_id));
   ASSERT_FALSE(browser_action->HasPopup(ExtensionAction::kDefaultTabId));
 
   // Simulate a click on the browser action icon.  The onClicked handler
   // will add a popup.
   {
     ResultCatcher catcher;
@@ skipping 12 matching lines @@
       << "popup.";
 
   ASSERT_STREQ("/a_popup.html",
                browser_action->GetPopupUrl(tab_id).path().c_str());
 
   // Now change the popup from a_popup.html to another_popup.html by loading
   // a page which removes the popup using chrome.browserAction.setPopup().
   {
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(
-        browser(),
-        GURL(extension->GetResourceURL("change_popup.html")));
+        browser(), GURL(extension_->GetResourceURL("change_popup.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   // The call to setPopup in change_popup.html did not use a tab id,
   // so the default setting should have changed as well as the current tab.
   ASSERT_TRUE(browser_action->HasPopup(tab_id));
   ASSERT_TRUE(browser_action->HasPopup(ExtensionAction::kDefaultTabId));
   ASSERT_STREQ("/another_popup.html",
                browser_action->GetPopupUrl(tab_id).path().c_str());
 }
 
 // Test that calling chrome.browserAction.setPopup() can remove a popup.
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionRemovePopup) {
   // Load the extension, which has a browser action with a default popup.
   ASSERT_TRUE(RunExtensionTest("browser_action/remove_popup")) << message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension_) << message_;
 
   int tab_id = ExtensionTabUtil::GetTabId(
       browser()->tab_strip_model()->GetActiveWebContents());
 
-  ExtensionAction* browser_action = GetBrowserAction(*extension);
+  ExtensionAction* browser_action = GetBrowserAction(*extension_);
   ASSERT_TRUE(browser_action)
       << "Browser action test extension should have a browser action.";
 
   ASSERT_TRUE(browser_action->HasPopup(tab_id))
       << "Expect a browser action popup before the test removes it.";
   ASSERT_TRUE(browser_action->HasPopup(ExtensionAction::kDefaultTabId))
       << "Expect a browser action popup is the default for all tabs.";
 
   // Load a page which removes the popup using chrome.browserAction.setPopup().
   {
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(
-        browser(),
-        GURL(extension->GetResourceURL("remove_popup.html")));
+        browser(), GURL(extension_->GetResourceURL("remove_popup.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   ASSERT_FALSE(browser_action->HasPopup(tab_id))
       << "Browser action popup should have been removed.";
   ASSERT_TRUE(browser_action->HasPopup(ExtensionAction::kDefaultTabId))
       << "Browser action popup default should not be changed by setting "
       << "a specific tab id.";
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoBasic) {
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension_) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
 
   // Open an incognito window and test that the browser action isn't there by
   // default.
   Profile* incognito_profile = browser()->profile()->GetOffTheRecordProfile();
   Browser* incognito_browser =
       new Browser(Browser::CreateParams(incognito_profile,
                                         browser()->host_desktop_type()));
 
   ASSERT_EQ(0,
             BrowserActionTestUtil(incognito_browser).NumberOfBrowserActions());
 
   // Now enable the extension in incognito mode, and test that the browser
   // action shows up. Note that we don't update the existing window at the
   // moment, so we just create a new one.
-  extensions::ExtensionSystem::Get(browser()->profile())->extension_service()->
-      extension_prefs()->SetIsIncognitoEnabled(extension->id(), true);
+  extensions::ExtensionSystem::Get(browser()->profile())
+      ->extension_service()
+      ->extension_prefs()
+      ->SetIsIncognitoEnabled(extension_->id(), true);
 
   chrome::CloseWindow(incognito_browser);
   incognito_browser =
       new Browser(Browser::CreateParams(incognito_profile,
                                         browser()->host_desktop_type()));
   ASSERT_EQ(1,
             BrowserActionTestUtil(incognito_browser).NumberOfBrowserActions());
 
   // TODO(mpcomplete): simulate a click and have it do the right thing in
   // incognito.
@@ skipping 71 matching lines @@
   EXPECT_EQ(kTooltipA, GetBrowserActionsBar().GetTooltip(2));
 
   EXPECT_EQ(kTooltipC, incognito_bar.GetTooltip(0));
   EXPECT_EQ(kTooltipA, incognito_bar.GetTooltip(1));
 }
 
 // Tests that events are dispatched to the correct profile for split mode
 // extensions.
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoSplit) {
   ResultCatcher catcher;
-  const Extension* extension = LoadExtensionWithFlags(
+  extension_ = LoadExtensionWithFlags(
       test_data_dir_.AppendASCII("browser_action/split_mode"),
       kFlagEnableIncognito);
-  ASSERT_TRUE(extension) << message_;
+  ASSERT_TRUE(extension_) << message_;
 
   // Open an incognito window.
   Profile* incognito_profile = browser()->profile()->GetOffTheRecordProfile();
   Browser* incognito_browser =
       new Browser(Browser::CreateParams(incognito_profile,
                                         browser()->host_desktop_type()));
   // Navigate just to have a tab in this window, otherwise wonky things happen.
   ui_test_utils::OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
   ASSERT_EQ(1,
             BrowserActionTestUtil(incognito_browser).NumberOfBrowserActions());
 
   // A click in the regular profile should open a tab in the regular profile.
   ExtensionToolbarModel* toolbar_model = ExtensionToolbarModel::Get(
       browser()->profile());
-  toolbar_model->ExecuteBrowserAction(extension, browser(), NULL, true);
+  toolbar_model->ExecuteBrowserAction(extension_, browser(), NULL, true);
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   // A click in the incognito profile should open a tab in the
   // incognito profile.
-  toolbar_model->ExecuteBrowserAction(extension, incognito_browser, NULL, true);
+  toolbar_model->ExecuteBrowserAction(
+      extension_, incognito_browser, NULL, true);
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // Disabled because of failures (crashes) on ASAN bot.
 // See http://crbug.com/98861.
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DISABLED_CloseBackgroundPage) {
-  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
-      "browser_action/close_background")));
-  const Extension* extension = GetSingleLoadedExtension();
+  extension_ = LoadExtension(
+      test_data_dir_.AppendASCII("browser_action/close_background"));
+  ASSERT_TRUE(extension_) << message_;
 
   // There is a background page and a browser action with no badge text.
   extensions::ProcessManager* manager =
       extensions::ExtensionSystem::Get(browser()->profile())->process_manager();
-  ASSERT_TRUE(manager->GetBackgroundHostForExtension(extension->id()));
-  ExtensionAction* action = GetBrowserAction(*extension);
+  ASSERT_TRUE(manager->GetBackgroundHostForExtension(extension_->id()));
+  ExtensionAction* action = GetBrowserAction(*extension_);
   ASSERT_EQ("", action->GetBadgeText(ExtensionAction::kDefaultTabId));
 
   content::WindowedNotificationObserver host_destroyed_observer(
       chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
       content::NotificationService::AllSources());
 
   // Click the browser action.
   ExtensionToolbarModel* toolbar_model = ExtensionToolbarModel::Get(
       browser()->profile());
-  toolbar_model->ExecuteBrowserAction(extension, browser(), NULL, true);
+  toolbar_model->ExecuteBrowserAction(extension_, browser(), NULL, true);
 
   // It can take a moment for the background page to actually get destroyed
   // so we wait for the notification before checking that it's really gone
   // and the badge text has been set.
   host_destroyed_observer.Wait();
-  ASSERT_FALSE(manager->GetBackgroundHostForExtension(extension->id()));
+  ASSERT_FALSE(manager->GetBackgroundHostForExtension(extension_->id()));
   ASSERT_EQ("X", action->GetBadgeText(ExtensionAction::kDefaultTabId));
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BadgeBackgroundColor) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("browser_action/color")) << message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension_) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
 
   // Test that CSS values (#FF0000) set color correctly.
-  ExtensionAction* action = GetBrowserAction(*extension);
+  ExtensionAction* action = GetBrowserAction(*extension_);
   ASSERT_EQ(SkColorSetARGB(255, 255, 0, 0),
             action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId));
 
   // Tell the extension to update the browser action state.
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
-      GURL(extension->GetResourceURL("update.html")));
+                               GURL(extension_->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 
   // Test that CSS values (#0F0) set color correctly.
   ASSERT_EQ(SkColorSetARGB(255, 0, 255, 0),
             action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId));
 
-  ui_test_utils::NavigateToURL(browser(),
-      GURL(extension->GetResourceURL("update2.html")));
+  ui_test_utils::NavigateToURL(
+      browser(), GURL(extension_->GetResourceURL("update2.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 
   // Test that array values set color correctly.
   ASSERT_EQ(SkColorSetARGB(255, 255, 255, 255),
             action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId));
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Getters) {
   ASSERT_TRUE(RunExtensionTest("browser_action/getters")) << message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension_) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
 
   // Test the getters for defaults.
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
-      GURL(extension->GetResourceURL("update.html")));
+                               GURL(extension_->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 
   // Test the getters for a specific tab.
-  ui_test_utils::NavigateToURL(browser(),
-      GURL(extension->GetResourceURL("update2.html")));
+  ui_test_utils::NavigateToURL(
+      browser(), GURL(extension_->GetResourceURL("update2.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 // Verify triggering browser action.
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TestTriggerBrowserAction) {
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(RunExtensionTest("trigger_actions/browser_action")) << message_;
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(extension) << message_;
+  extension_ = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension_) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
 
   ui_test_utils::NavigateToURL(
      browser(),
      test_server()->GetURL("files/simple.html"));
 
-  ExtensionAction* browser_action = GetBrowserAction(*extension);
+  ExtensionAction* browser_action = GetBrowserAction(*extension_);
   EXPECT_TRUE(browser_action != NULL);
 
   // Simulate a click on the browser action icon.
   {
     ResultCatcher catcher;
     GetBrowserActionsBar().Press(0);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 
   WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(tab != NULL);
 
   // Verify that the browser action turned the background color red.
   const std::string script =
       "window.domAutomationController.send(document.body.style."
       "backgroundColor);";
   std::string result;
   const std::string frame_xpath;
   EXPECT_TRUE(content::ExecuteScriptInFrameAndExtractString(
       tab, frame_xpath, script, &result));
   EXPECT_EQ(result, "red");
 }
 
 }  // namespace
 }  // namespace extensions