[Extensions Toolbar] Refactor a few test classes

chrome/browser/extensions/extension_keybinding_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 "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/component_loader.h"
@@ skipping 115 matching lines @@
 }
 
 } // namespace
 
 class CommandsApiTest : public ExtensionApiTest {
  public:
   CommandsApiTest() {}
   ~CommandsApiTest() override {}
 
  protected:
-  BrowserActionTestUtil GetBrowserActionsBar() {
-    return BrowserActionTestUtil(browser());
-  }
-
   bool IsGrantedForTab(const Extension* extension,
                        const content::WebContents* web_contents) {
     return extension->permissions_data()->HasAPIPermissionForTab(
         SessionTabHelper::IdForTab(web_contents), APIPermission::kTab);
   }
 
 #if defined(OS_CHROMEOS)
   void RunChromeOSConversionTest(const std::string& extension_path) {
     // Setup the environment.
     ASSERT_TRUE(test_server()->Start());
@@ skipping 30 matching lines @@
   ASSERT_TRUE(RunExtensionTest("keybinding/basics")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // Load this extension, which uses the same keybindings but sets the page
   // to different colors. This is so we can see that it doesn't interfere. We
   // don't test this extension in any other way (it should otherwise be
   // immaterial to this test).
   ASSERT_TRUE(RunExtensionTest("keybinding/conflicting")) << message_;
 
+  BrowserActionTestUtil browser_actions_bar(browser());
   // Test that there are two browser actions in the toolbar.
-  ASSERT_EQ(2, GetBrowserActionsBar().NumberOfBrowserActions());
+  ASSERT_EQ(2, browser_actions_bar.NumberOfBrowserActions());
 
   ui_test_utils::NavigateToURL(
       browser(), test_server()->GetURL("files/extensions/test_file.txt"));
 
   // activeTab shouldn't have been granted yet.
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(tab);
 
   EXPECT_FALSE(IsGrantedForTab(extension, tab));
 
@@ skipping 764 matching lines @@
 
   extensions::ExtensionSystem::Get(browser()->profile())
       ->extension_service()
       ->component_loader()
       ->Remove("pkplfbidichfdicaijlchgnapepdginl");
 
   ASSERT_TRUE(RunComponentExtensionTest("keybinding/component")) << message_;
 }
 
 }  // namespace extensions