Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1113)

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_application_menu_item_model_unittest.cc

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" 5 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
6 6
7 #include <utility>
8
7 #include "base/macros.h" 9 #include "base/macros.h"
8 #include "base/test/histogram_tester.h" 10 #include "base/test/histogram_tester.h"
9 #include "chrome/browser/ui/ash/launcher/test/launcher_application_menu_item_mod el_test_api.h" 11 #include "chrome/browser/ui/ash/launcher/test/launcher_application_menu_item_mod el_test_api.h"
10 #include "chrome/browser/ui/ash/launcher/test/test_chrome_launcher_app_menu_item .h" 12 #include "chrome/browser/ui/ash/launcher/test/test_chrome_launcher_app_menu_item .h"
11 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
12 14
13 namespace { 15 namespace {
14 16
15 const char kNumItemsEnabledHistogramName[] = 17 const char kNumItemsEnabledHistogramName[] =
16 "Ash.Shelf.Menu.NumItemsEnabledUponSelection"; 18 "Ash.Shelf.Menu.NumItemsEnabledUponSelection";
17 19
18 const char kSelectedMenuItemIndexHistogramName[] = 20 const char kSelectedMenuItemIndexHistogramName[] =
19 "Ash.Shelf.Menu.SelectedMenuItemIndex"; 21 "Ash.Shelf.Menu.SelectedMenuItemIndex";
20 22
21 } // namespace 23 } // namespace
22 24
23 // Verifies LauncherApplicationMenuItemModel::GetNumMenuItemsEnabled() return 25 // Verifies LauncherApplicationMenuItemModel::GetNumMenuItemsEnabled() return
24 // value when there are zero menu items. 26 // value when there are zero menu items.
25 TEST(LauncherApplicationMenuItemModelTest, 27 TEST(LauncherApplicationMenuItemModelTest,
26 VerifyGetNumMenuItemsEnabledWithNoMenuItems) { 28 VerifyGetNumMenuItemsEnabledWithNoMenuItems) {
27 ChromeLauncherAppMenuItems menu_items; 29 ChromeLauncherAppMenuItems menu_items;
28 LauncherApplicationMenuItemModel menu_model(menu_items.Pass()); 30 LauncherApplicationMenuItemModel menu_model(std::move(menu_items));
29 LauncherApplicationMenuItemModelTestAPI menu_model_test_api(&menu_model); 31 LauncherApplicationMenuItemModelTestAPI menu_model_test_api(&menu_model);
30 32
31 EXPECT_EQ(0, menu_model_test_api.GetNumMenuItemsEnabled()); 33 EXPECT_EQ(0, menu_model_test_api.GetNumMenuItemsEnabled());
32 } 34 }
33 35
34 // Verifies LauncherApplicationMenuItemModel::GetNumMenuItemsEnabled() return 36 // Verifies LauncherApplicationMenuItemModel::GetNumMenuItemsEnabled() return
35 // value when there are a mix of enabled and disabled menu items. 37 // value when there are a mix of enabled and disabled menu items.
36 TEST(LauncherApplicationMenuItemModelTest, 38 TEST(LauncherApplicationMenuItemModelTest,
37 VerifyGetNumMenuItemsEnabledWithMenuItems) { 39 VerifyGetNumMenuItemsEnabledWithMenuItems) {
38 ChromeLauncherAppMenuItems menu_items; 40 ChromeLauncherAppMenuItems menu_items;
(...skipping 12 matching lines...) Expand all
51 53
52 TestChromeLauncherAppMenuItem* disabled_menu_item_1 = 54 TestChromeLauncherAppMenuItem* disabled_menu_item_1 =
53 new TestChromeLauncherAppMenuItem(); 55 new TestChromeLauncherAppMenuItem();
54 disabled_menu_item_1->set_is_enabled(false); 56 disabled_menu_item_1->set_is_enabled(false);
55 57
56 menu_items.push_back(enabled_menu_item_1); 58 menu_items.push_back(enabled_menu_item_1);
57 menu_items.push_back(disabled_menu_item_1); 59 menu_items.push_back(disabled_menu_item_1);
58 menu_items.push_back(enabled_menu_item_2); 60 menu_items.push_back(enabled_menu_item_2);
59 menu_items.push_back(enabled_menu_item_3); 61 menu_items.push_back(enabled_menu_item_3);
60 62
61 LauncherApplicationMenuItemModel menu_model(menu_items.Pass()); 63 LauncherApplicationMenuItemModel menu_model(std::move(menu_items));
62 LauncherApplicationMenuItemModelTestAPI menu_model_test_api(&menu_model); 64 LauncherApplicationMenuItemModelTestAPI menu_model_test_api(&menu_model);
63 65
64 EXPECT_EQ(3, menu_model_test_api.GetNumMenuItemsEnabled()); 66 EXPECT_EQ(3, menu_model_test_api.GetNumMenuItemsEnabled());
65 } 67 }
66 68
67 // Verifies the correct histogram buckets are recorded for 69 // Verifies the correct histogram buckets are recorded for
68 // LauncherApplicationMenuItemModel::RecordMenuItemSelectedMetrics. 70 // LauncherApplicationMenuItemModel::RecordMenuItemSelectedMetrics.
69 TEST(LauncherApplicationMenuItemModelTest, 71 TEST(LauncherApplicationMenuItemModelTest,
70 VerifyHistogramBucketsRecordedByRecordMenuItemSelectedMetrics) { 72 VerifyHistogramBucketsRecordedByRecordMenuItemSelectedMetrics) {
71 const int kCommandId = 3; 73 const int kCommandId = 3;
72 const int kNumMenuItemsEnabled = 7; 74 const int kNumMenuItemsEnabled = 7;
73 75
74 base::HistogramTester histogram_tester; 76 base::HistogramTester histogram_tester;
75 77
76 ChromeLauncherAppMenuItems menu_items; 78 ChromeLauncherAppMenuItems menu_items;
77 LauncherApplicationMenuItemModel menu_model(menu_items.Pass()); 79 LauncherApplicationMenuItemModel menu_model(std::move(menu_items));
78 LauncherApplicationMenuItemModelTestAPI menu_model_test_api(&menu_model); 80 LauncherApplicationMenuItemModelTestAPI menu_model_test_api(&menu_model);
79 menu_model_test_api.RecordMenuItemSelectedMetrics(kCommandId, 81 menu_model_test_api.RecordMenuItemSelectedMetrics(kCommandId,
80 kNumMenuItemsEnabled); 82 kNumMenuItemsEnabled);
81 83
82 histogram_tester.ExpectTotalCount(kNumItemsEnabledHistogramName, 1); 84 histogram_tester.ExpectTotalCount(kNumItemsEnabledHistogramName, 1);
83 histogram_tester.ExpectBucketCount(kNumItemsEnabledHistogramName, 85 histogram_tester.ExpectBucketCount(kNumItemsEnabledHistogramName,
84 kNumMenuItemsEnabled, 1); 86 kNumMenuItemsEnabled, 1);
85 87
86 histogram_tester.ExpectTotalCount(kSelectedMenuItemIndexHistogramName, 1); 88 histogram_tester.ExpectTotalCount(kSelectedMenuItemIndexHistogramName, 1);
87 histogram_tester.ExpectBucketCount(kSelectedMenuItemIndexHistogramName, 89 histogram_tester.ExpectBucketCount(kSelectedMenuItemIndexHistogramName,
88 kCommandId, 1); 90 kCommandId, 1);
89 } 91 }
90 92
91 // Verify histogram data is recorded when 93 // Verify histogram data is recorded when
92 // LauncherApplicationMenuItemModel::ExecuteCommand is called. 94 // LauncherApplicationMenuItemModel::ExecuteCommand is called.
93 TEST(LauncherApplicationMenuItemModelTest, 95 TEST(LauncherApplicationMenuItemModelTest,
94 VerifyHistogramDataIsRecordedWhenExecuteCommandIsCalled) { 96 VerifyHistogramDataIsRecordedWhenExecuteCommandIsCalled) {
95 const int kCommandId = 0; 97 const int kCommandId = 0;
96 const int kFlags = 0; 98 const int kFlags = 0;
97 99
98 ChromeLauncherAppMenuItems menu_items; 100 ChromeLauncherAppMenuItems menu_items;
99 TestChromeLauncherAppMenuItem* menu_item = 101 TestChromeLauncherAppMenuItem* menu_item =
100 new TestChromeLauncherAppMenuItem(); 102 new TestChromeLauncherAppMenuItem();
101 menu_item->set_is_enabled(true); 103 menu_item->set_is_enabled(true);
102 menu_items.push_back(menu_item); 104 menu_items.push_back(menu_item);
103 105
104 base::HistogramTester histogram_tester; 106 base::HistogramTester histogram_tester;
105 107
106 LauncherApplicationMenuItemModel menu_model(menu_items.Pass()); 108 LauncherApplicationMenuItemModel menu_model(std::move(menu_items));
107 menu_model.ExecuteCommand(kCommandId, kFlags); 109 menu_model.ExecuteCommand(kCommandId, kFlags);
108 110
109 histogram_tester.ExpectTotalCount(kNumItemsEnabledHistogramName, 1); 111 histogram_tester.ExpectTotalCount(kNumItemsEnabledHistogramName, 1);
110 histogram_tester.ExpectTotalCount(kSelectedMenuItemIndexHistogramName, 1); 112 histogram_tester.ExpectTotalCount(kSelectedMenuItemIndexHistogramName, 1);
111 } 113 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698