Chromium Code Reviews| Index: chrome/browser/memory/tab_manager_browsertest.cc |
| diff --git a/chrome/browser/memory/tab_manager_browsertest.cc b/chrome/browser/memory/tab_manager_browsertest.cc |
| index 4b0dbedc9d45172b44df9cadaccd476c9a9e3252..80d96a94ae302fc9fb0e7274050a75c078be0933 100644 |
| --- a/chrome/browser/memory/tab_manager_browsertest.cc |
| +++ b/chrome/browser/memory/tab_manager_browsertest.cc |
| @@ -28,7 +28,7 @@ |
| using content::OpenURLParams; |
| -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) |
| +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) |
| namespace memory { |
| @@ -181,6 +181,9 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, TabManagerBasics) { |
| EXPECT_TRUE(chrome::CanGoForward(browser())); |
| } |
| +// On Linux, a memory pressure listener is not implemented yet. |
| +#if !defined(OS_LINUX) |
|
sky
2016/04/21 16:59:18
What about chromeos?
hajimehoshi
2016/04/22 08:05:48
Done.
|
| + |
| // Test that the MemoryPressureListener event is properly triggering a tab |
| // discard upon |MEMORY_PRESSURE_LEVEL_CRITICAL| event. |
| IN_PROC_BROWSER_TEST_F(TabManagerTest, OomPressureListener) { |
| @@ -231,6 +234,8 @@ IN_PROC_BROWSER_TEST_F(TabManagerTest, OomPressureListener) { |
| EXPECT_TRUE(tab_manager->recent_tab_discard()); |
| } |
| +#endif |
| + |
| IN_PROC_BROWSER_TEST_F(TabManagerTest, InvalidOrEmptyURL) { |
| TabManager* tab_manager = g_browser_process->GetTabManager(); |
| ASSERT_TRUE(tab_manager); |