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

Side by Side Diff: chrome/browser/ui/startup/startup_tab_provider_unittest.cc

Issue 2469363002: Tech Debt Repayment for StartupBrowserCreatorImpl Refactor (Closed)
Patch Set: sky comments Created 3 years, 10 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
« no previous file with comments | « chrome/browser/ui/startup/startup_tab_provider.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/startup/startup_tab_provider.h" 5 #include "chrome/browser/ui/startup/startup_tab_provider.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/common/url_constants.h" 8 #include "chrome/common/url_constants.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "url/gurl.h" 10 #include "url/gurl.h"
11 11
12 TEST(StartupTabProviderTest, CheckStandardOnboardingTabPolicy) { 12 TEST(StartupTabProviderTest, GetStandardOnboardingTabsForState) {
13 // Show welcome page to new unauthenticated profile on first run. 13 // Show welcome page to new unauthenticated profile on first run.
14 StartupTabs output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy( 14 StartupTabs output =
15 true, false, false, false); 15 StartupTabProviderImpl::GetStandardOnboardingTabsForState(true, false,
16 false, false);
16 17
17 ASSERT_EQ(1U, output.size()); 18 ASSERT_EQ(1U, output.size());
18 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url); 19 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url);
19 EXPECT_FALSE(output[0].is_pinned); 20 EXPECT_FALSE(output[0].is_pinned);
20 21
21 // After first run, display welcome page using variant view. 22 // After first run, display welcome page using variant view.
22 output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy( 23 output = StartupTabProviderImpl::GetStandardOnboardingTabsForState(
23 false, false, false, false); 24 false, false, false, false);
24 25
25 ASSERT_EQ(1U, output.size()); 26 ASSERT_EQ(1U, output.size());
26 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(true), output[0].url); 27 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(true), output[0].url);
27 EXPECT_FALSE(output[0].is_pinned); 28 EXPECT_FALSE(output[0].is_pinned);
28 } 29 }
29 30
30 TEST(StartupTabProviderTest, CheckStandardOnboardingTabPolicy_Negative) { 31 TEST(StartupTabProviderTest, GetStandardOnboardingTabsForState_Negative) {
31 // Do not show the welcome page to the same profile twice. 32 // Do not show the welcome page to the same profile twice.
32 StartupTabs output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy( 33 StartupTabs output =
33 true, true, false, false); 34 StartupTabProviderImpl::GetStandardOnboardingTabsForState(true, true,
35 false, false);
34 36
35 EXPECT_TRUE(output.empty()); 37 EXPECT_TRUE(output.empty());
36 38
37 // Do not show the welcome page to authenticated users. 39 // Do not show the welcome page to authenticated users.
38 output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy( 40 output = StartupTabProviderImpl::GetStandardOnboardingTabsForState(
39 true, false, true, false); 41 true, false, true, false);
40 42
41 EXPECT_TRUE(output.empty()); 43 EXPECT_TRUE(output.empty());
42 44
43 // Do not show the welcome page to supervised users. 45 // Do not show the welcome page to supervised users.
44 output = StartupTabProviderImpl::CheckStandardOnboardingTabPolicy( 46 output = StartupTabProviderImpl::GetStandardOnboardingTabsForState(
45 true, false, false, true); 47 true, false, false, true);
46 48
47 EXPECT_TRUE(output.empty()); 49 EXPECT_TRUE(output.empty());
48 } 50 }
49 51
50 #if defined(OS_WIN) 52 #if defined(OS_WIN)
51 TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy) { 53 TEST(StartupTabProviderTest, GetWin10OnboardingTabsForState) {
52 // Show Win 10 Welcome page if it has not been seen, but the standard page 54 // Show Win 10 Welcome page if it has not been seen, but the standard page
53 // has. 55 // has.
54 StartupTabs output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 56 StartupTabs output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
55 true, true, false, false, true, false, false); 57 true, true, false, false, true, false, false);
56 58
57 ASSERT_EQ(1U, output.size()); 59 ASSERT_EQ(1U, output.size());
58 EXPECT_EQ(StartupTabProviderImpl::GetWin10WelcomePageUrl(false), 60 EXPECT_EQ(StartupTabProviderImpl::GetWin10WelcomePageUrl(false),
59 output[0].url); 61 output[0].url);
60 EXPECT_FALSE(output[0].is_pinned); 62 EXPECT_FALSE(output[0].is_pinned);
61 63
62 // Show standard Welcome page if the Win 10 Welcome page has been seen, but 64 // Show standard Welcome page if the Win 10 Welcome page has been seen, but
63 // the standard page has not. 65 // the standard page has not.
64 output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 66 output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
65 true, false, true, false, true, false, false); 67 true, false, true, false, true, false, false);
66 68
67 ASSERT_EQ(1U, output.size()); 69 ASSERT_EQ(1U, output.size());
68 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url); 70 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url);
69 EXPECT_FALSE(output[0].is_pinned); 71 EXPECT_FALSE(output[0].is_pinned);
70 72
71 // If neither page has been seen, the Win 10 Welcome page takes precedence 73 // If neither page has been seen, the Win 10 Welcome page takes precedence
72 // this launch. 74 // this launch.
73 output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 75 output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
74 true, false, false, false, true, false, false); 76 true, false, false, false, true, false, false);
75 77
76 ASSERT_EQ(1U, output.size()); 78 ASSERT_EQ(1U, output.size());
77 EXPECT_EQ(StartupTabProviderImpl::GetWin10WelcomePageUrl(false), 79 EXPECT_EQ(StartupTabProviderImpl::GetWin10WelcomePageUrl(false),
78 output[0].url); 80 output[0].url);
79 EXPECT_FALSE(output[0].is_pinned); 81 EXPECT_FALSE(output[0].is_pinned);
80 } 82 }
81 83
82 TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy_LaterRunVariant) { 84 TEST(StartupTabProviderTest, GetWin10OnboardingTabsForState_LaterRunVariant) {
83 // Show a variant of the Win 10 Welcome page after first run, if it has not 85 // Show a variant of the Win 10 Welcome page after first run, if it has not
84 // been seen. 86 // been seen.
85 StartupTabs output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 87 StartupTabs output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
86 false, false, false, false, true, false, false); 88 false, false, false, false, true, false, false);
87 89
88 ASSERT_EQ(1U, output.size()); 90 ASSERT_EQ(1U, output.size());
89 EXPECT_EQ(StartupTabProviderImpl::GetWin10WelcomePageUrl(true), 91 EXPECT_EQ(StartupTabProviderImpl::GetWin10WelcomePageUrl(true),
90 output[0].url); 92 output[0].url);
91 EXPECT_FALSE(output[0].is_pinned); 93 EXPECT_FALSE(output[0].is_pinned);
92 94
93 // Show a variant of the standard Welcome page after first run, if the Win 10 95 // Show a variant of the standard Welcome page after first run, if the Win 10
94 // Welcome page has already been seen but the standard has not. 96 // Welcome page has already been seen but the standard has not.
95 output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 97 output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
96 false, false, true, false, true, false, false); 98 false, false, true, false, true, false, false);
97 99
98 ASSERT_EQ(1U, output.size()); 100 ASSERT_EQ(1U, output.size());
99 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(true), output[0].url); 101 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(true), output[0].url);
100 EXPECT_FALSE(output[0].is_pinned); 102 EXPECT_FALSE(output[0].is_pinned);
101 } 103 }
102 104
103 TEST(StartupTabProviderTest, CheckWin10OnboardingTabPolicy_Negative) { 105 TEST(StartupTabProviderTest, GetWin10OnboardingTabsForState_Negative) {
104 // Do not show either page if it has already been shown. 106 // Do not show either page if it has already been shown.
105 StartupTabs output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 107 StartupTabs output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
106 true, true, true, false, true, false, false); 108 true, true, true, false, true, false, false);
107 109
108 EXPECT_TRUE(output.empty()); 110 EXPECT_TRUE(output.empty());
109 111
110 // Do not show either page to supervised users. 112 // Do not show either page to supervised users.
111 output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 113 output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
112 true, false, false, false, true, false, true); 114 true, false, false, false, true, false, true);
113 115
114 EXPECT_TRUE(output.empty()); 116 EXPECT_TRUE(output.empty());
115 117
116 // If Chrome is already the default browser, don't show the Win 10 Welcome 118 // If Chrome is already the default browser, don't show the Win 10 Welcome
117 // page, and don't preempt the standard Welcome page. 119 // page, and don't preempt the standard Welcome page.
118 output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 120 output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
119 true, false, false, false, true, true, false); 121 true, false, false, false, true, true, false);
120 122
121 ASSERT_EQ(1U, output.size()); 123 ASSERT_EQ(1U, output.size());
122 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url); 124 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url);
123 EXPECT_FALSE(output[0].is_pinned); 125 EXPECT_FALSE(output[0].is_pinned);
124 126
125 // If the user is signed in, block showing the standard Welcome page. 127 // If the user is signed in, block showing the standard Welcome page.
126 output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 128 output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
127 true, false, true, true, true, false, false); 129 true, false, true, true, true, false, false);
128 130
129 EXPECT_TRUE(output.empty()); 131 EXPECT_TRUE(output.empty());
130 } 132 }
131 133
132 TEST(StartupTabProviderTest, 134 TEST(StartupTabProviderTest,
133 CheckWin10OnboardingTabPolicy_SetDefaultBrowserNotAllowed) { 135 GetWin10OnboardingTabsForState_SetDefaultBrowserNotAllowed) {
134 // Skip the Win 10 promo if setting the default browser is not allowed. 136 // Skip the Win 10 promo if setting the default browser is not allowed.
135 StartupTabs output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 137 StartupTabs output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
136 true, false, false, false, false, false, false); 138 true, false, false, false, false, false, false);
137 139
138 ASSERT_EQ(1U, output.size()); 140 ASSERT_EQ(1U, output.size());
139 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url); 141 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[0].url);
140 142
141 // After first run, no onboarding content is displayed when setting the 143 // After first run, no onboarding content is displayed when setting the
142 // default browser is not allowed. 144 // default browser is not allowed.
143 output = StartupTabProviderImpl::CheckWin10OnboardingTabPolicy( 145 output = StartupTabProviderImpl::GetWin10OnboardingTabsForState(
144 true, true, false, false, false, false, false); 146 true, true, false, false, false, false, false);
145 147
146 EXPECT_TRUE(output.empty()); 148 EXPECT_TRUE(output.empty());
147 } 149 }
148 150
149 #endif 151 #endif
150 152
151 TEST(StartupTabProviderTest, CheckMasterPrefsTabPolicy) { 153 TEST(StartupTabProviderTest, GetMasterPrefsTabsForState) {
152 std::vector<GURL> input = {GURL(base::ASCIIToUTF16("https://new_tab_page")), 154 std::vector<GURL> input = {GURL(base::ASCIIToUTF16("https://new_tab_page")),
153 GURL(base::ASCIIToUTF16("https://www.google.com")), 155 GURL(base::ASCIIToUTF16("https://www.google.com")),
154 GURL(base::ASCIIToUTF16("https://welcome_page"))}; 156 GURL(base::ASCIIToUTF16("https://welcome_page"))};
155 157
156 StartupTabs output = 158 StartupTabs output =
157 StartupTabProviderImpl::CheckMasterPrefsTabPolicy(true, input); 159 StartupTabProviderImpl::GetMasterPrefsTabsForState(true, input);
158 160
159 ASSERT_EQ(3U, output.size()); 161 ASSERT_EQ(3U, output.size());
160 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url); 162 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url);
161 EXPECT_FALSE(output[0].is_pinned); 163 EXPECT_FALSE(output[0].is_pinned);
162 EXPECT_EQ(input[1], output[1].url); 164 EXPECT_EQ(input[1], output[1].url);
163 EXPECT_FALSE(output[1].is_pinned); 165 EXPECT_FALSE(output[1].is_pinned);
164 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[2].url); 166 EXPECT_EQ(StartupTabProviderImpl::GetWelcomePageUrl(false), output[2].url);
165 EXPECT_FALSE(output[2].is_pinned); 167 EXPECT_FALSE(output[2].is_pinned);
166 } 168 }
167 169
168 TEST(StartupTabProviderTest, CheckMasterPrefsTabPolicy_FirstRunOnly) { 170 TEST(StartupTabProviderTest, GetMasterPrefsTabsForState_FirstRunOnly) {
169 std::vector<GURL> input = { 171 std::vector<GURL> input = {
170 GURL(base::ASCIIToUTF16("https://www.google.com"))}; 172 GURL(base::ASCIIToUTF16("https://www.google.com"))};
171 173
172 StartupTabs output = 174 StartupTabs output =
173 StartupTabProviderImpl::CheckMasterPrefsTabPolicy(false, input); 175 StartupTabProviderImpl::GetMasterPrefsTabsForState(false, input);
174 176
175 EXPECT_TRUE(output.empty()); 177 EXPECT_TRUE(output.empty());
176 } 178 }
177 179
178 TEST(StartupTabProviderTest, CheckResetTriggerTabPolicy) { 180 TEST(StartupTabProviderTest, GetResetTriggerTabsForState) {
179 StartupTabs output = StartupTabProviderImpl::CheckResetTriggerTabPolicy(true); 181 StartupTabs output =
182 StartupTabProviderImpl::GetResetTriggerTabsForState(true);
180 183
181 ASSERT_EQ(1U, output.size()); 184 ASSERT_EQ(1U, output.size());
182 EXPECT_EQ(StartupTabProviderImpl::GetTriggeredResetSettingsUrl(), 185 EXPECT_EQ(StartupTabProviderImpl::GetTriggeredResetSettingsUrl(),
183 output[0].url); 186 output[0].url);
184 EXPECT_FALSE(output[0].is_pinned); 187 EXPECT_FALSE(output[0].is_pinned);
185 } 188 }
186 189
187 TEST(StartupTabProviderTest, CheckResetTriggerTabPolicy_Negative) { 190 TEST(StartupTabProviderTest, GetResetTriggerTabsForState_Negative) {
188 StartupTabs output = 191 StartupTabs output =
189 StartupTabProviderImpl::CheckResetTriggerTabPolicy(false); 192 StartupTabProviderImpl::GetResetTriggerTabsForState(false);
190 193
191 ASSERT_TRUE(output.empty()); 194 ASSERT_TRUE(output.empty());
192 } 195 }
193 196
194 TEST(StartupTabProviderTest, CheckPinnedTabPolicy) { 197 TEST(StartupTabProviderTest, GetPinnedTabsForState) {
195 StartupTabs pinned = {StartupTab(GURL("https://www.google.com"), true)}; 198 StartupTabs pinned = {StartupTab(GURL("https://www.google.com"), true)};
196 SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT); 199 SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT);
197 SessionStartupPref pref_urls(SessionStartupPref::Type::URLS); 200 SessionStartupPref pref_urls(SessionStartupPref::Type::URLS);
198 201
199 StartupTabs output = 202 StartupTabs output =
200 StartupTabProviderImpl::CheckPinnedTabPolicy(pref_default, pinned); 203 StartupTabProviderImpl::GetPinnedTabsForState(pref_default, pinned);
201 204
202 ASSERT_EQ(1U, output.size()); 205 ASSERT_EQ(1U, output.size());
203 EXPECT_EQ("www.google.com", output[0].url.host()); 206 EXPECT_EQ("www.google.com", output[0].url.host());
204 207
205 output = StartupTabProviderImpl::CheckPinnedTabPolicy(pref_urls, pinned); 208 output = StartupTabProviderImpl::GetPinnedTabsForState(pref_urls, pinned);
206 209
207 ASSERT_EQ(1U, output.size()); 210 ASSERT_EQ(1U, output.size());
208 EXPECT_EQ("www.google.com", output[0].url.host()); 211 EXPECT_EQ("www.google.com", output[0].url.host());
209 } 212 }
210 213
211 TEST(StartupTabProviderTest, CheckPinnedTabPolicy_Negative) { 214 TEST(StartupTabProviderTest, GetPinnedTabsForState_Negative) {
212 StartupTabs pinned = {StartupTab(GURL("https://www.google.com"), true)}; 215 StartupTabs pinned = {StartupTab(GURL("https://www.google.com"), true)};
213 SessionStartupPref pref_last(SessionStartupPref::Type::LAST); 216 SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
214 217
215 StartupTabs output = 218 StartupTabs output =
216 StartupTabProviderImpl::CheckPinnedTabPolicy(pref_last, pinned); 219 StartupTabProviderImpl::GetPinnedTabsForState(pref_last, pinned);
217 220
218 ASSERT_TRUE(output.empty()); 221 ASSERT_TRUE(output.empty());
219 } 222 }
220 223
221 TEST(StartupTabProviderTest, CheckPreferencesTabPolicy) { 224 TEST(StartupTabProviderTest, GetPreferencesTabsForState) {
222 SessionStartupPref pref(SessionStartupPref::Type::URLS); 225 SessionStartupPref pref(SessionStartupPref::Type::URLS);
223 pref.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))}; 226 pref.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
224 227
225 StartupTabs output = 228 StartupTabs output =
226 StartupTabProviderImpl::CheckPreferencesTabPolicy(pref, false); 229 StartupTabProviderImpl::GetPreferencesTabsForState(pref, false);
227 230
228 ASSERT_EQ(1U, output.size()); 231 ASSERT_EQ(1U, output.size());
229 EXPECT_EQ("www.google.com", output[0].url.host()); 232 EXPECT_EQ("www.google.com", output[0].url.host());
230 } 233 }
231 234
232 TEST(StartupTabProviderTest, CheckPreferencesTabPolicy_WrongType) { 235 TEST(StartupTabProviderTest, GetPreferencesTabsForState_WrongType) {
233 SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT); 236 SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT);
234 pref_default.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))}; 237 pref_default.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
235 238
236 StartupTabs output = 239 StartupTabs output =
237 StartupTabProviderImpl::CheckPreferencesTabPolicy(pref_default, false); 240 StartupTabProviderImpl::GetPreferencesTabsForState(pref_default, false);
238 241
239 EXPECT_TRUE(output.empty()); 242 EXPECT_TRUE(output.empty());
240 243
241 SessionStartupPref pref_last(SessionStartupPref::Type::LAST); 244 SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
242 pref_last.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))}; 245 pref_last.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
243 246
244 output = StartupTabProviderImpl::CheckPreferencesTabPolicy(pref_last, false); 247 output = StartupTabProviderImpl::GetPreferencesTabsForState(pref_last, false);
245 248
246 EXPECT_TRUE(output.empty()); 249 EXPECT_TRUE(output.empty());
247 } 250 }
248 251
249 TEST(StartupTabProviderTest, CheckPreferencesTabPolicy_NotFirstBrowser) { 252 TEST(StartupTabProviderTest, GetPreferencesTabsForState_NotFirstBrowser) {
250 SessionStartupPref pref(SessionStartupPref::Type::URLS); 253 SessionStartupPref pref(SessionStartupPref::Type::URLS);
251 pref.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))}; 254 pref.urls = {GURL(base::ASCIIToUTF16("https://www.google.com"))};
252 255
253 StartupTabs output = 256 StartupTabs output =
254 StartupTabProviderImpl::CheckPreferencesTabPolicy(pref, true); 257 StartupTabProviderImpl::GetPreferencesTabsForState(pref, true);
255 258
256 EXPECT_TRUE(output.empty()); 259 EXPECT_TRUE(output.empty());
257 } 260 }
258 261
259 TEST(StartupTabProviderTest, CheckNewTabPageTabPolicy) { 262 TEST(StartupTabProviderTest, GetNewTabPageTabsForState) {
260 SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT); 263 SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT);
261 SessionStartupPref pref_urls(SessionStartupPref::Type::URLS); 264 SessionStartupPref pref_urls(SessionStartupPref::Type::URLS);
262 265
263 StartupTabs output = 266 StartupTabs output =
264 StartupTabProviderImpl::CheckNewTabPageTabPolicy(pref_default); 267 StartupTabProviderImpl::GetNewTabPageTabsForState(pref_default);
265 268
266 ASSERT_EQ(1U, output.size()); 269 ASSERT_EQ(1U, output.size());
267 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url); 270 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url);
268 271
269 output = StartupTabProviderImpl::CheckNewTabPageTabPolicy(pref_urls); 272 output = StartupTabProviderImpl::GetNewTabPageTabsForState(pref_urls);
270 273
271 ASSERT_EQ(1U, output.size()); 274 ASSERT_EQ(1U, output.size());
272 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url); 275 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), output[0].url);
273 } 276 }
274 277
275 TEST(StartupTabProviderTest, CheckNewTabPageTabPolicy_Negative) { 278 TEST(StartupTabProviderTest, GetNewTabPageTabsForState_Negative) {
276 SessionStartupPref pref_last(SessionStartupPref::Type::LAST); 279 SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
277 280
278 StartupTabs output = 281 StartupTabs output =
279 StartupTabProviderImpl::CheckNewTabPageTabPolicy(pref_last); 282 StartupTabProviderImpl::GetNewTabPageTabsForState(pref_last);
280 283
281 ASSERT_TRUE(output.empty()); 284 ASSERT_TRUE(output.empty());
282 } 285 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_tab_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698