[Extensions Toolbar] Refactor a few test classes

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"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/browser_action_test_util.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"
@@ skipping 55 matching lines @@
   SkBitmap bitmap2 = i2.GetRepresentation(scale).sk_bitmap();
   return gfx::BitmapsAreEqual(bitmap1, bitmap2);
 }
 
 class BrowserActionApiTest : public ExtensionApiTest {
  public:
   BrowserActionApiTest() {}
   ~BrowserActionApiTest() override {}
 
  protected:
-  BrowserActionTestUtil GetBrowserActionsBar() {
-    return BrowserActionTestUtil(browser());
+  BrowserActionTestUtil* GetBrowserActionsBar() {
+    if (!browser_action_test_util_)
+      browser_action_test_util_.reset(new BrowserActionTestUtil(browser()));
+    return browser_action_test_util_.get();
   }
 
   bool OpenPopup(int index) {
     ResultCatcher catcher;
     content::WindowedNotificationObserver popup_observer(
         content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
         content::NotificationService::AllSources());
-    GetBrowserActionsBar().Press(index);
+    GetBrowserActionsBar()->Press(index);
     popup_observer.Wait();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-    return GetBrowserActionsBar().HasPopup();
+    return GetBrowserActionsBar()->HasPopup();
   }
 
   ExtensionAction* GetBrowserAction(const Extension& extension) {
     return ExtensionActionManager::Get(browser()->profile())->
         GetBrowserAction(extension);
   }
+
+ private:
+  scoped_ptr<BrowserActionTestUtil> browser_action_test_util_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserActionApiTest);
 };
 
 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_;
 
   // Test that there is a browser action in the toolbar.
-  ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
+  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")));
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   // Test that we received the changes.
   ExtensionAction* action = GetBrowserAction(*extension);
   ASSERT_EQ("Modified", action->GetTitle(ExtensionAction::kDefaultTabId));
@@ skipping 26 matching lines @@
 #endif
 
   // We should not be creating icons asynchronously, so we don't need an
   // observer.
   ExtensionActionIconFactory icon_factory(
       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));
+  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());
 
   uint32_t action_icon_current_id = 0;
 
   ResultCatcher catcher;
 
   // Tell the extension to update the icon using ImageData object.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
   action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_FALSE(action_icon.ToImageSkia()->HasRepresentation(2.0f));
 
   EXPECT_TRUE(
       ImagesAreEqualAtScale(AddBackgroundForViews(*action_icon.ToImageSkia()),
-                            *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
+                            *GetBrowserActionsBar()->GetIcon(0).ToImageSkia(),
                             1.0f));
 
   // Tell the extension to update the icon using path.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
   action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_FALSE(
       action_icon.ToImageSkia()->HasRepresentation(2.0f));
 
   EXPECT_TRUE(
       ImagesAreEqualAtScale(AddBackgroundForViews(*action_icon.ToImageSkia()),
-                            *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
+                            *GetBrowserActionsBar()->GetIcon(0).ToImageSkia(),
                             1.0f));
 
   // Tell the extension to update the icon using dictionary of ImageData
   // objects.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
   action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_TRUE(action_icon.ToImageSkia()->HasRepresentation(2.0f));
 
   EXPECT_TRUE(
       ImagesAreEqualAtScale(AddBackgroundForViews(*action_icon.ToImageSkia()),
-                            *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
+                            *GetBrowserActionsBar()->GetIcon(0).ToImageSkia(),
                             1.0f));
 
   // Tell the extension to update the icon using dictionary of paths.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
   action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_TRUE(action_icon.ToImageSkia()->HasRepresentation(2.0f));
 
   EXPECT_TRUE(
       ImagesAreEqualAtScale(AddBackgroundForViews(*action_icon.ToImageSkia()),
-                            *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
+                            *GetBrowserActionsBar()->GetIcon(0).ToImageSkia(),
                             1.0f));
 
   // Tell the extension to update the icon using dictionary of ImageData
   // objects, but setting only size 19.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
   action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_FALSE(action_icon.ToImageSkia()->HasRepresentation(2.0f));
 
   EXPECT_TRUE(
       ImagesAreEqualAtScale(AddBackgroundForViews(*action_icon.ToImageSkia()),
-                            *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
+                            *GetBrowserActionsBar()->GetIcon(0).ToImageSkia(),
                             1.0f));
 
   // Tell the extension to update the icon using dictionary of paths, but
   // setting only size 19.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
   action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_FALSE(action_icon.ToImageSkia()->HasRepresentation(2.0f));
 
   EXPECT_TRUE(
       ImagesAreEqualAtScale(AddBackgroundForViews(*action_icon.ToImageSkia()),
-                            *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
+                            *GetBrowserActionsBar()->GetIcon(0).ToImageSkia(),
                             1.0f));
 
   // Tell the extension to update the icon using dictionary of ImageData
   // objects, but setting only size 38.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
   action_icon = icon_factory.GetIcon(0);
 
   const gfx::ImageSkia* action_icon_skia = action_icon.ToImageSkia();
 
   EXPECT_FALSE(action_icon_skia->HasRepresentation(1.0f));
   EXPECT_TRUE(action_icon_skia->HasRepresentation(2.0f));
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_TRUE(gfx::BitmapsAreEqual(
       *action_icon.ToSkBitmap(),
       action_icon_skia->GetRepresentation(2.0f).sk_bitmap()));
 
   EXPECT_TRUE(
       ImagesAreEqualAtScale(AddBackgroundForViews(*action_icon_skia),
-                            *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
+                            *GetBrowserActionsBar()->GetIcon(0).ToImageSkia(),
                             2.0f));
 
   // Try setting icon with empty dictionary of ImageData objects.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_FALSE(catcher.GetNextResult());
   EXPECT_EQ(kEmptyImageDataError, catcher.message());
 
   // Try setting icon with empty dictionary of path objects.
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_FALSE(catcher.GetNextResult());
   EXPECT_EQ(kEmptyPathError, catcher.message());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
   ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
       message_;
   const Extension* extension = GetSingleLoadedExtension();
   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));
+  ASSERT_EQ(1, GetBrowserActionsBar()->NumberOfBrowserActions());
+  EXPECT_TRUE(GetBrowserActionsBar()->HasIcon(0));
 
   // Execute the action, its title should change.
   ResultCatcher catcher;
-  GetBrowserActionsBar().Press(0);
+  GetBrowserActionsBar()->Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
-  EXPECT_EQ("Showing icon 2", GetBrowserActionsBar().GetTooltip(0));
+  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));
+  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));
+  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));
+  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")));
-  BrowserActionTestUtil actions_bar = GetBrowserActionsBar();
+  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());
 
   // Simulate a click on the browser action and verify the size of the resulting
   // popup.  The first one tries to be 0x0, so it should be the min values.
   ASSERT_TRUE(OpenPopup(0));
-  EXPECT_EQ(minSize, actions_bar.GetPopupSize());
-  EXPECT_TRUE(actions_bar.HidePopup());
+  EXPECT_EQ(minSize, actions_bar->GetPopupSize());
+  EXPECT_TRUE(actions_bar->HidePopup());
 
   ASSERT_TRUE(OpenPopup(0));
-  EXPECT_EQ(middleSize, actions_bar.GetPopupSize());
-  EXPECT_TRUE(actions_bar.HidePopup());
+  EXPECT_EQ(middleSize, actions_bar->GetPopupSize());
+  EXPECT_TRUE(actions_bar->HidePopup());
 
   // One more time, but this time it should be constrained by the max values.
   ASSERT_TRUE(OpenPopup(0));
-  EXPECT_EQ(maxSize, actions_bar.GetPopupSize());
-  EXPECT_TRUE(actions_bar.HidePopup());
+  EXPECT_EQ(maxSize, actions_bar->GetPopupSize());
+  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_;
 
   int tab_id = ExtensionTabUtil::GetTabId(
       browser()->tab_strip_model()->GetActiveWebContents());
 
   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;
-    GetBrowserActionsBar().Press(0);
+    GetBrowserActionsBar()->Press(0);
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   // The call to setPopup in background.html set a tab id, so the
   // current tab's setting should have changed, but the default setting
   // should not have changed.
   ASSERT_TRUE(browser_action->HasPopup(tab_id))
       << "Clicking on the browser action should have caused a popup to "
       << "be added.";
   ASSERT_FALSE(browser_action->HasPopup(ExtensionAction::kDefaultTabId))
@@ skipping 57 matching lines @@
 }
 
 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_;
 
   // Test that there is a browser action in the toolbar.
-  ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
+  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();
   base::RunLoop().RunUntilIdle();  // Wait for profile initialization.
   Browser* incognito_browser =
       new Browser(Browser::CreateParams(incognito_profile,
                                         browser()->host_desktop_type()));
 
   ASSERT_EQ(0,
@@ skipping 80 matching lines @@
   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_;
 
   // Test that there is a browser action in the toolbar.
-  ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
+  ASSERT_EQ(1, GetBrowserActionsBar()->NumberOfBrowserActions());
 
   // Test that CSS values (#FF0000) set color correctly.
   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")));
@@ skipping 11 matching lines @@
   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_;
 
   // Test that there is a browser action in the toolbar.
-  ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
+  ASSERT_EQ(1, GetBrowserActionsBar()->NumberOfBrowserActions());
 
   // Test the getters for defaults.
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       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")));
   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_;
 
   // Test that there is a browser action in the toolbar.
-  ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
+  ASSERT_EQ(1, GetBrowserActionsBar()->NumberOfBrowserActions());
 
   ui_test_utils::NavigateToURL(
      browser(),
      test_server()->GetURL("files/simple.html"));
 
   ExtensionAction* browser_action = GetBrowserAction(*extension);
   EXPECT_TRUE(browser_action != NULL);
 
   // Simulate a click on the browser action icon.
   {
     ResultCatcher catcher;
-    GetBrowserActionsBar().Press(0);
+    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;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(tab, script, &result));
   EXPECT_EQ(result, "red");
 }
 
 }  // namespace
 }  // namespace extensions