[Extensions Toolbar] Refactor a few test classes

chrome/browser/ui/toolbar/toolbar_actions_bar_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 "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.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_manager.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_helper.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 
 namespace {
@@ skipping 98 matching lines @@
   // in a debug message. These aren't enforced to be unique, so don't make
   // duplicates.
   // If any of these is wrong, returns testing::AssertionFailure() with a
   // message.
   testing::AssertionResult VerifyToolbarOrder(
       const char* expected_names[],
       size_t total_size,
       size_t visible_count) WARN_UNUSED_RESULT;
 
   ToolbarActionsBar* toolbar_actions_bar() {
-    return main_bar_helper_->GetToolbarActionsBar();
+    return browser_action_test_util_->GetToolbarActionsBar();
   }
   ToolbarActionsBar* overflow_bar() {
-    return overflow_bar_helper_->GetToolbarActionsBar();
+    return overflow_browser_action_test_util_->GetToolbarActionsBar();
   }
   extensions::ExtensionToolbarModel* toolbar_model() {
     return toolbar_model_;
   }
   BrowserActionTestUtil* browser_action_test_util() {
     return browser_action_test_util_.get();
   }
   BrowserActionTestUtil* overflow_browser_action_test_util() {
     return overflow_browser_action_test_util_.get();
   }
 
  private:
-  // The test helper that owns the ToolbarActionsBar and the platform-specific
-  // view for it.
-  scoped_ptr<TestToolbarActionsBarHelper> main_bar_helper_;
-
-  // The test helper for the overflow bar; only non-null if |use_redesign| is
-  // true.
-  scoped_ptr<TestToolbarActionsBarHelper> overflow_bar_helper_;
-
   // The associated ExtensionToolbarModel (owned by the keyed service setup).
   extensions::ExtensionToolbarModel* toolbar_model_;
 
   // A BrowserActionTestUtil object constructed with the associated
   // ToolbarActionsBar.
   scoped_ptr<BrowserActionTestUtil> browser_action_test_util_;
 
   // The overflow container's BrowserActionTestUtil (only non-null if
   // |use_redesign| is true).
   scoped_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_;
@@ skipping 19 matching lines @@
       static_cast<extensions::TestExtensionSystem*>(
           extensions::ExtensionSystem::Get(profile()));
   extension_system->CreateExtensionService(
       base::CommandLine::ForCurrentProcess(),
       base::FilePath(),
       false);
   toolbar_model_ =
       extensions::extension_action_test_util::CreateToolbarModelForProfile(
           profile());
 
-  main_bar_helper_ = TestToolbarActionsBarHelper::Create(browser(), nullptr);
-
   ToolbarActionsBar::disable_animations_for_testing_ = true;
   ToolbarActionsBar::set_send_overflowed_action_changes_for_testing(false);
-  browser_action_test_util_.reset(
-      new BrowserActionTestUtil(browser(),
-                                toolbar_actions_bar()->delegate_for_test()));
+  browser_action_test_util_.reset(new BrowserActionTestUtil(browser(), false));
 
   if (use_redesign_) {
-    overflow_bar_helper_ =
-        TestToolbarActionsBarHelper::Create(browser(), main_bar_helper_.get());
-    overflow_browser_action_test_util_.reset(
-        new BrowserActionTestUtil(browser(),
-                                  overflow_bar()->delegate_for_test()));
+    overflow_browser_action_test_util_ =
+        browser_action_test_util_->CreateOverflowBar();
   }
 }
 
 void ToolbarActionsBarUnitTest::TearDown() {
   // Since the profile gets destroyed in BrowserWithTestWindowTest::TearDown(),
   // we need to delete this now.
-  overflow_bar_helper_.reset();
-  main_bar_helper_.reset();
+  browser_action_test_util_.reset();
+  overflow_browser_action_test_util_.reset();
   ToolbarActionsBar::disable_animations_for_testing_ = false;
   redesign_switch_.reset();
   BrowserWithTestWindowTest::TearDown();
 }
 
 void ToolbarActionsBarUnitTest::ActivateTab(int index) {
   ASSERT_NE(nullptr, browser()->tab_strip_model()->GetWebContentsAt(index));
   browser()->tab_strip_model()->ActivateTabAt(index, true);
 }
 
@@ skipping 237 matching lines @@
       ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);
   EXPECT_FALSE(
       ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
           profile()));
   base::Time one_week_ago = base::Time::Now() - base::TimeDelta::FromDays(7);
   prefs->SetInt64(prefs::kToolbarIconSurfacingBubbleLastShowTime,
                   one_week_ago.ToInternalValue());
   EXPECT_TRUE(
       prefs->GetBoolean(prefs::kToolbarIconSurfacingBubbleAcknowledged));
 }