OLD | NEW |
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "base/macros.h" | 5 #include "base/macros.h" |
6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
7 #include "chrome/browser/memory/tab_manager.h" | 7 #include "chrome/browser/memory/tab_manager.h" |
8 #include "chrome/browser/memory/tab_manager_observer.h" | 8 #include "chrome/browser/memory/tab_manager_observer.h" |
9 #include "chrome/browser/memory/tab_manager_web_contents_data.h" | 9 #include "chrome/browser/memory/tab_manager_web_contents_data.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 DISALLOW_COPY_AND_ASSIGN(MockTabManagerObserver); | 81 DISALLOW_COPY_AND_ASSIGN(MockTabManagerObserver); |
82 }; | 82 }; |
83 | 83 |
84 IN_PROC_BROWSER_TEST_F(TabManagerObserverTest, OnDiscardStateChange) { | 84 IN_PROC_BROWSER_TEST_F(TabManagerObserverTest, OnDiscardStateChange) { |
85 TabManager* tab_manager = g_browser_process->GetTabManager(); | 85 TabManager* tab_manager = g_browser_process->GetTabManager(); |
86 auto* tsm = browser()->tab_strip_model(); | 86 auto* tsm = browser()->tab_strip_model(); |
87 set_tab_strip_model(tsm); | 87 set_tab_strip_model(tsm); |
88 | 88 |
89 // Open two tabs. | 89 // Open two tabs. |
90 OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(), | 90 OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(), |
91 NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false); | 91 WindowOpenDisposition::NEW_BACKGROUND_TAB, |
| 92 ui::PAGE_TRANSITION_TYPED, false); |
92 int index_1 = GetIndex(browser()->OpenURL(open1)); | 93 int index_1 = GetIndex(browser()->OpenURL(open1)); |
93 | 94 |
94 OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(), | 95 OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(), |
95 NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false); | 96 WindowOpenDisposition::NEW_BACKGROUND_TAB, |
| 97 ui::PAGE_TRANSITION_TYPED, false); |
96 int index_2 = GetIndex(browser()->OpenURL(open2)); | 98 int index_2 = GetIndex(browser()->OpenURL(open2)); |
97 | 99 |
98 // Subscribe observer to TabManager's observer list. | 100 // Subscribe observer to TabManager's observer list. |
99 MockTabManagerObserver tabmanager_observer; | 101 MockTabManagerObserver tabmanager_observer; |
100 tab_manager->AddObserver(&tabmanager_observer); | 102 tab_manager->AddObserver(&tabmanager_observer); |
101 | 103 |
102 // Discards both tabs and make sure the events were observed properly. | 104 // Discards both tabs and make sure the events were observed properly. |
103 EXPECT_TRUE(tab_manager->DiscardTabById(ContentsId(GetContents(index_1)))); | 105 EXPECT_TRUE(tab_manager->DiscardTabById(ContentsId(GetContents(index_1)))); |
104 EXPECT_EQ(1, tabmanager_observer.nb_events()); | 106 EXPECT_EQ(1, tabmanager_observer.nb_events()); |
105 EXPECT_EQ(ContentsId(GetContents(index_1)), | 107 EXPECT_EQ(ContentsId(GetContents(index_1)), |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 EXPECT_EQ(4, tabmanager_observer.nb_events()); | 145 EXPECT_EQ(4, tabmanager_observer.nb_events()); |
144 } | 146 } |
145 | 147 |
146 IN_PROC_BROWSER_TEST_F(TabManagerObserverTest, OnAutoDiscardableStateChange) { | 148 IN_PROC_BROWSER_TEST_F(TabManagerObserverTest, OnAutoDiscardableStateChange) { |
147 TabManager* tab_manager = g_browser_process->GetTabManager(); | 149 TabManager* tab_manager = g_browser_process->GetTabManager(); |
148 auto tsm = browser()->tab_strip_model(); | 150 auto tsm = browser()->tab_strip_model(); |
149 set_tab_strip_model(tsm); | 151 set_tab_strip_model(tsm); |
150 | 152 |
151 // Open two tabs. | 153 // Open two tabs. |
152 OpenURLParams open(GURL(chrome::kChromeUIAboutURL), content::Referrer(), | 154 OpenURLParams open(GURL(chrome::kChromeUIAboutURL), content::Referrer(), |
153 NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false); | 155 WindowOpenDisposition::NEW_BACKGROUND_TAB, |
| 156 ui::PAGE_TRANSITION_TYPED, false); |
154 WebContents* contents = browser()->OpenURL(open); | 157 WebContents* contents = browser()->OpenURL(open); |
155 | 158 |
156 // Subscribe observer to TabManager's observer list. | 159 // Subscribe observer to TabManager's observer list. |
157 MockTabManagerObserver observer; | 160 MockTabManagerObserver observer; |
158 tab_manager->AddObserver(&observer); | 161 tab_manager->AddObserver(&observer); |
159 | 162 |
160 // No events initially. | 163 // No events initially. |
161 EXPECT_EQ(0, observer.nb_events()); | 164 EXPECT_EQ(0, observer.nb_events()); |
162 | 165 |
163 // Should maintain at zero since the default value of the state is true. | 166 // Should maintain at zero since the default value of the state is true. |
(...skipping 13 matching lines...) Expand all Loading... |
177 // Change it back and we should have another event. | 180 // Change it back and we should have another event. |
178 tab_manager->SetTabAutoDiscardableState(contents, true); | 181 tab_manager->SetTabAutoDiscardableState(contents, true); |
179 EXPECT_EQ(2, observer.nb_events()); | 182 EXPECT_EQ(2, observer.nb_events()); |
180 EXPECT_TRUE(observer.is_auto_discardable()); | 183 EXPECT_TRUE(observer.is_auto_discardable()); |
181 EXPECT_EQ(ContentsId(contents), ContentsId(observer.content())); | 184 EXPECT_EQ(ContentsId(contents), ContentsId(observer.content())); |
182 } | 185 } |
183 | 186 |
184 } // namespace memory | 187 } // namespace memory |
185 | 188 |
186 #endif // OS_WIN || OS_MAXOSX || OS_LINUX | 189 #endif // OS_WIN || OS_MAXOSX || OS_LINUX |
OLD | NEW |