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

Side by Side Diff: chrome/browser/chromeos/first_run/goodies_displayer_browsertest.cc

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: Rebase to ToT 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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/chromeos/first_run/goodies_displayer.h" 7 #include "chrome/browser/chromeos/first_run/goodies_displayer.h"
8 #include "chrome/browser/profiles/profile_manager.h" 8 #include "chrome/browser/profiles/profile_manager.h"
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 15 matching lines...) Expand all
26 ~GoodiesDisplayerBrowserTest() override { 26 ~GoodiesDisplayerBrowserTest() override {
27 first_run::GoodiesDisplayer::Delete(); 27 first_run::GoodiesDisplayer::Delete();
28 } 28 }
29 29
30 // Set up windowless browser and GoodiesDisplayer. |delta_days| is +/- delta 30 // Set up windowless browser and GoodiesDisplayer. |delta_days| is +/- delta
31 // in days from kMaxDaysAfterOobeForGoodies; <= 0: "show", > 0: "don't show". 31 // in days from kMaxDaysAfterOobeForGoodies; <= 0: "show", > 0: "don't show".
32 Browser* CreateBrowserAndDisplayer(int delta_days) { 32 Browser* CreateBrowserAndDisplayer(int delta_days) {
33 // Create a new browser and wait for completion. 33 // Create a new browser and wait for completion.
34 ui_test_utils::BrowserAddedObserver browser_added_observer; 34 ui_test_utils::BrowserAddedObserver browser_added_observer;
35 Browser* browser = new Browser( 35 Browser* browser = new Browser(
36 Browser::CreateParams(ProfileManager::GetActiveUserProfile())); 36 Browser::CreateParams(ProfileManager::GetActiveUserProfile(), true));
37 browser_added_observer.WaitForSingleNewBrowser(); 37 browser_added_observer.WaitForSingleNewBrowser();
38 38
39 // Set up Goodies Displayer and set fake age of device. 39 // Set up Goodies Displayer and set fake age of device.
40 setup_info_.days_since_oobe = 40 setup_info_.days_since_oobe =
41 first_run::GoodiesDisplayer::kMaxDaysAfterOobeForGoodies + delta_days; 41 first_run::GoodiesDisplayer::kMaxDaysAfterOobeForGoodies + delta_days;
42 first_run::GoodiesDisplayer::InitForTesting(&setup_info_); 42 first_run::GoodiesDisplayer::InitForTesting(&setup_info_);
43 WaitForGoodiesSetup(); 43 WaitForGoodiesSetup();
44 44
45 return browser; 45 return browser;
46 } 46 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 } 117 }
118 118
119 // Tests that the Goodies page is shown, only once, on non-incognito browser 119 // Tests that the Goodies page is shown, only once, on non-incognito browser
120 // when device isn't too old, and when --no-first-run is not specified. 120 // when device isn't too old, and when --no-first-run is not specified.
121 IN_PROC_BROWSER_TEST_P(GoodiesDisplayerBrowserTest, DisplayGoodies) { 121 IN_PROC_BROWSER_TEST_P(GoodiesDisplayerBrowserTest, DisplayGoodies) {
122 ASSERT_EQ(0u, chrome::GetTotalBrowserCount()); 122 ASSERT_EQ(0u, chrome::GetTotalBrowserCount());
123 Browser* browser = CreateBrowserAndDisplayer(-1); 123 Browser* browser = CreateBrowserAndDisplayer(-1);
124 ASSERT_EQ(1u, chrome::GetTotalBrowserCount()); 124 ASSERT_EQ(1u, chrome::GetTotalBrowserCount());
125 125
126 // Shouldn't show Goodies tab in incognito mode. 126 // Shouldn't show Goodies tab in incognito mode.
127 Browser* incognito_browser = new Browser( 127 Browser* incognito_browser = new Browser(Browser::CreateParams(
128 Browser::CreateParams(browser->profile()->GetOffTheRecordProfile())); 128 browser->profile()->GetOffTheRecordProfile(), true));
129 ASSERT_EQ(2u, chrome::GetTotalBrowserCount()); 129 ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
130 AddBlankTabAndShow(incognito_browser); 130 AddBlankTabAndShow(incognito_browser);
131 ExpectTabCounts(incognito_browser, 1, 0); 131 ExpectTabCounts(incognito_browser, 1, 0);
132 CloseBrowserSynchronously(incognito_browser); 132 CloseBrowserSynchronously(incognito_browser);
133 ASSERT_EQ(1u, chrome::GetTotalBrowserCount()); 133 ASSERT_EQ(1u, chrome::GetTotalBrowserCount());
134 EXPECT_TRUE(g_browser_process->local_state()->GetBoolean( 134 EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
135 prefs::kCanShowOobeGoodiesPage)); 135 prefs::kCanShowOobeGoodiesPage));
136 136
137 // First logged-in browser shows Goodies if --no-first-run is not specified. 137 // First logged-in browser shows Goodies if --no-first-run is not specified.
138 AddBlankTabAndShow(browser); 138 AddBlankTabAndShow(browser);
(...skipping 10 matching lines...) Expand all
149 ASSERT_EQ(2u, chrome::GetTotalBrowserCount()); 149 ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
150 ExpectTabCounts(browser2, 1, 0); 150 ExpectTabCounts(browser2, 1, 0);
151 } 151 }
152 152
153 INSTANTIATE_TEST_CASE_P(/* no prefix */, 153 INSTANTIATE_TEST_CASE_P(/* no prefix */,
154 GoodiesDisplayerBrowserTest, 154 GoodiesDisplayerBrowserTest,
155 testing::Values(true, false)); 155 testing::Values(true, false));
156 156
157 } // namespace chromeos 157 } // namespace chromeos
158 158
OLDNEW
« no previous file with comments | « chrome/browser/captive_portal/captive_portal_browsertest.cc ('k') | chrome/browser/download/download_crx_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698