Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc

 // Copyright 2015 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 "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
 
 #include <utility>
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 57 matching lines @@
   // AshTestBase:
   void SetUp() override;
   void TearDown() override;
 
   // Calls ButtonPressed on the test target with the given |event|
   // and dummy values for the |sender| and |performed_action| parameters.
   void ButtonPressed(const ui::Event& event);
 
   // Calls ButtonPressed on the test target with the given |performed_action|
   // and dummy values for the |event| and |sender| parameters.
-  void ButtonPressed(ShelfItemDelegate::PerformedAction performed_action);
+  void ButtonPressed(ShelfAction performed_action);
 
   // Calls ButtonPressed on the test target with the given |sender| and
   // |performed_action| and a dummy value for the |event| parameter.
-  void ButtonPressed(const views::Button* sender,
-                     ShelfItemDelegate::PerformedAction performed_action);
+  void ButtonPressed(const views::Button* sender, ShelfAction performed_action);
 
  protected:
   // The test target. Not owned.
   ShelfButtonPressedMetricTracker* metric_tracker_;
 
   // The TickClock injected in to the test target.
   base::SimpleTestTickClock* tick_clock_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShelfButtonPressedMetricTrackerTest);
@@ skipping 30 matching lines @@
 
 void ShelfButtonPressedMetricTrackerTest::TearDown() {
   tick_clock_ = nullptr;
 
   AshTestBase::TearDown();
 }
 
 void ShelfButtonPressedMetricTrackerTest::ButtonPressed(
     const ui::Event& event) {
   const DummyButton kDummyButton;
-  metric_tracker_->ButtonPressed(event, &kDummyButton,
-                                 ShelfItemDelegate::kNoAction);
+  metric_tracker_->ButtonPressed(event, &kDummyButton, SHELF_ACTION_NONE);
 }
 
 void ShelfButtonPressedMetricTrackerTest::ButtonPressed(
-    ShelfItemDelegate::PerformedAction performed_action) {
+    ShelfAction performed_action) {
   const DummyEvent kDummyEvent;
   const DummyButton kDummyButton;
   metric_tracker_->ButtonPressed(kDummyEvent, &kDummyButton, performed_action);
 }
 
 void ShelfButtonPressedMetricTrackerTest::ButtonPressed(
     const views::Button* sender,
-    ShelfItemDelegate::PerformedAction performed_action) {
+    ShelfAction performed_action) {
   const DummyEvent kDummyEvent;
   metric_tracker_->ButtonPressed(kDummyEvent, sender, performed_action);
 }
 
 }  // namespace
 
 // Verifies that a Launcher_ButtonPressed_Mouse UMA user action is recorded when
 // a button is pressed by a mouse event.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_ButtonPressed_MouseIsRecordedWhenIconActivatedByMouse) {
@@ skipping 17 matching lines @@
   ButtonPressed(touch_event);
   EXPECT_EQ(1,
             user_action_tester.GetActionCount("Launcher_ButtonPressed_Touch"));
 }
 
 // Verifies that a Launcher_LaunchTask UMA user action is recorded when
 // pressing a button causes a new window to be created.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_LaunchTaskIsRecordedWhenNewWindowIsCreated) {
   base::UserActionTester user_action_tester;
-  ButtonPressed(ShelfItemDelegate::kNewWindowCreated);
+  ButtonPressed(SHELF_ACTION_NEW_WINDOW_CREATED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_LaunchTask"));
 }
 
 // Verifies that a Launcher_MinimizeTask UMA user action is recorded when
 // pressing a button causes an existing window to be minimized.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_MinimizeTaskIsRecordedWhenWindowIsMinimized) {
   base::UserActionTester user_action_tester;
-  ButtonPressed(ShelfItemDelegate::kExistingWindowMinimized);
+  ButtonPressed(SHELF_ACTION_WINDOW_MINIMIZED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_MinimizeTask"));
 }
 
 // Verifies that a Launcher_SwitchTask UMA user action is recorded when
 // pressing a button causes an existing window to be activated.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        Launcher_SwitchTaskIsRecordedWhenExistingWindowIsActivated) {
   base::UserActionTester user_action_tester;
-  ButtonPressed(ShelfItemDelegate::kExistingWindowActivated);
+  ButtonPressed(SHELF_ACTION_WINDOW_ACTIVATED);
   EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_SwitchTask"));
 }
 
 // Verify that a window activation action will record a data point if it was
 // subsequent to a minimize action.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        VerifyDataRecordedAfterMinimizedAndSubsequentActivatedAction) {
   const DummyButton kDummyButton;
 
   base::HistogramTester histogram_tester;
 
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowMinimized);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_MINIMIZED);
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 0);
 
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowActivated);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_ACTIVATED);
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1);
 }
 
 // Verify that a multiple window activation actions will record a single data
 // point if they are subsequent to a minimize action.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        VerifyDataRecordedAfterMinimizedAndMultipleSubsequentActivatedActions) {
   const DummyButton kDummyButton;
 
   base::HistogramTester histogram_tester;
 
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowMinimized);
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowActivated);
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowActivated);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_MINIMIZED);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_ACTIVATED);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_ACTIVATED);
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1);
 }
 
 // Verify that a window activation action will not record a data point if it was
 // not subsequent to a minimize action.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        VerifyDataRecordedAfterMinimizedAndNonSubsequentActivatedAction) {
   const DummyButton kDummyButton;
 
   base::HistogramTester histogram_tester;
 
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowMinimized);
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kAppListMenuShown);
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowActivated);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_MINIMIZED);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_APP_LIST_SHOWN);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_ACTIVATED);
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 0);
 }
 
 // Verify no data is recorded if a second source button is pressed in between
 // subsequent minimized and activated actions on the same source.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        VerifyDataRecordedAfterMinimizedButtonA) {
   const DummyButton kDummyButton;
   const DummyButton kSecondDummyButton;
 
   base::HistogramTester histogram_tester;
 
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowMinimized);
-  ButtonPressed(&kSecondDummyButton,
-                ShelfItemDelegate::kExistingWindowMinimized);
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowActivated);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_MINIMIZED);
+  ButtonPressed(&kSecondDummyButton, SHELF_ACTION_WINDOW_MINIMIZED);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_ACTIVATED);
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 0);
 }
 
 // Verify the data value recorded when a window activation action is subsequent
 // to a minimize action.
 TEST_F(ShelfButtonPressedMetricTrackerTest,
        VerifyTheValueRecordedBySubsequentMinimizedAndActivateActions) {
   const int kTimeDeltaInMilliseconds = 17;
   const DummyButton kDummyButton;
 
   base::HistogramTester histogram_tester;
 
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowMinimized);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_MINIMIZED);
   tick_clock_->Advance(
       base::TimeDelta::FromMilliseconds(kTimeDeltaInMilliseconds));
-  ButtonPressed(&kDummyButton, ShelfItemDelegate::kExistingWindowActivated);
+  ButtonPressed(&kDummyButton, SHELF_ACTION_WINDOW_ACTIVATED);
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1);
   histogram_tester.ExpectBucketCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName,
       kTimeDeltaInMilliseconds, 1);
 }
 
 }  // namespace test
 }  // namespace ash