OLD | NEW |
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 12 matching lines...) Expand all Loading... |
23 protected: | 23 protected: |
24 ~GoodiesDisplayerBrowserTest() override { | 24 ~GoodiesDisplayerBrowserTest() override { |
25 first_run::GoodiesDisplayer::Delete(); | 25 first_run::GoodiesDisplayer::Delete(); |
26 } | 26 } |
27 | 27 |
28 // Set up windowless browser and GoodiesDisplayer. |delta_days| is +/- delta | 28 // Set up windowless browser and GoodiesDisplayer. |delta_days| is +/- delta |
29 // in days from kMaxDaysAfterOobeForGoodies; <= 0: "show", > 0: "don't show". | 29 // in days from kMaxDaysAfterOobeForGoodies; <= 0: "show", > 0: "don't show". |
30 Browser* CreateBrowserAndDisplayer(int delta_days) { | 30 Browser* CreateBrowserAndDisplayer(int delta_days) { |
31 // Create a new browser and wait for completion. | 31 // Create a new browser and wait for completion. |
32 ui_test_utils::BrowserAddedObserver browser_added_observer; | 32 ui_test_utils::BrowserAddedObserver browser_added_observer; |
33 Browser* browser = new Browser(Browser::CreateParams( | 33 Browser* browser = new Browser( |
34 ProfileManager::GetActiveUserProfile(), chrome::GetActiveDesktop())); | 34 Browser::CreateParams(ProfileManager::GetActiveUserProfile())); |
35 browser_added_observer.WaitForSingleNewBrowser(); | 35 browser_added_observer.WaitForSingleNewBrowser(); |
36 | 36 |
37 // Set up Goodies Displayer and set fake age of device. | 37 // Set up Goodies Displayer and set fake age of device. |
38 setup_info_.days_since_oobe = | 38 setup_info_.days_since_oobe = |
39 first_run::GoodiesDisplayer::kMaxDaysAfterOobeForGoodies + delta_days; | 39 first_run::GoodiesDisplayer::kMaxDaysAfterOobeForGoodies + delta_days; |
40 first_run::GoodiesDisplayer::InitForTesting(&setup_info_); | 40 first_run::GoodiesDisplayer::InitForTesting(&setup_info_); |
41 WaitForGoodiesSetup(); | 41 WaitForGoodiesSetup(); |
42 | 42 |
43 return browser; | 43 return browser; |
44 } | 44 } |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 | 102 |
103 // Tests that the Goodies page is shown, only once, on non-incognito browser | 103 // Tests that the Goodies page is shown, only once, on non-incognito browser |
104 // when device isn't too old. | 104 // when device isn't too old. |
105 IN_PROC_BROWSER_TEST_F(GoodiesDisplayerBrowserTest, DisplayGoodies) { | 105 IN_PROC_BROWSER_TEST_F(GoodiesDisplayerBrowserTest, DisplayGoodies) { |
106 ASSERT_EQ(0u, chrome::GetTotalBrowserCount()); | 106 ASSERT_EQ(0u, chrome::GetTotalBrowserCount()); |
107 Browser* browser = CreateBrowserAndDisplayer(-1); | 107 Browser* browser = CreateBrowserAndDisplayer(-1); |
108 ASSERT_EQ(1u, chrome::GetTotalBrowserCount()); | 108 ASSERT_EQ(1u, chrome::GetTotalBrowserCount()); |
109 | 109 |
110 // Shouldn't show Goodies tab in incognito mode. | 110 // Shouldn't show Goodies tab in incognito mode. |
111 Browser* incognito_browser = new Browser( | 111 Browser* incognito_browser = new Browser( |
112 Browser::CreateParams(browser->profile()->GetOffTheRecordProfile(), | 112 Browser::CreateParams(browser->profile()->GetOffTheRecordProfile())); |
113 chrome::GetActiveDesktop())); | |
114 ASSERT_EQ(2u, chrome::GetTotalBrowserCount()); | 113 ASSERT_EQ(2u, chrome::GetTotalBrowserCount()); |
115 AddBlankTabAndShow(incognito_browser); | 114 AddBlankTabAndShow(incognito_browser); |
116 ExpectTabCounts(incognito_browser, 1, 0); | 115 ExpectTabCounts(incognito_browser, 1, 0); |
117 CloseBrowserSynchronously(incognito_browser); | 116 CloseBrowserSynchronously(incognito_browser); |
118 ASSERT_EQ(1u, chrome::GetTotalBrowserCount()); | 117 ASSERT_EQ(1u, chrome::GetTotalBrowserCount()); |
119 EXPECT_TRUE(g_browser_process->local_state()->GetBoolean( | 118 EXPECT_TRUE(g_browser_process->local_state()->GetBoolean( |
120 prefs::kCanShowOobeGoodiesPage)); | 119 prefs::kCanShowOobeGoodiesPage)); |
121 | 120 |
122 // First logged-in browser shows Goodies. | 121 // First logged-in browser shows Goodies. |
123 AddBlankTabAndShow(browser); | 122 AddBlankTabAndShow(browser); |
124 ExpectTabCounts(browser, 2, 1); | 123 ExpectTabCounts(browser, 2, 1); |
125 EXPECT_FALSE(g_browser_process->local_state()->GetBoolean( | 124 EXPECT_FALSE(g_browser_process->local_state()->GetBoolean( |
126 prefs::kCanShowOobeGoodiesPage)); | 125 prefs::kCanShowOobeGoodiesPage)); |
127 | 126 |
128 // Next time a browser is opened, no Goodies. | 127 // Next time a browser is opened, no Goodies. |
129 Browser* browser2 = CreateBrowser(browser->profile()); | 128 Browser* browser2 = CreateBrowser(browser->profile()); |
130 ASSERT_EQ(2u, chrome::GetTotalBrowserCount()); | 129 ASSERT_EQ(2u, chrome::GetTotalBrowserCount()); |
131 ExpectTabCounts(browser2, 1, 0); | 130 ExpectTabCounts(browser2, 1, 0); |
132 } | 131 } |
133 | 132 |
134 } // namespace chromeos | 133 } // namespace chromeos |
135 | 134 |
OLD | NEW |