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..31e423128c3db70c7782a999443e0419dd1860ef 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) |
| namespace memory { |
| @@ -38,7 +38,7 @@ class TabManagerTest : public InProcessBrowserTest { |
| // by turning on the corresponding experiment as some tests assume this |
| // behavior it turned on. |
| void SetUpCommandLine(base::CommandLine* command_line) override { |
| -#if !defined(OS_CHROMEOS) |
| +#if !defined(OS_LINUX) |
| command_line->AppendSwitchASCII(switches::kEnableFeatures, |
| features::kAutomaticTabDiscarding.name); |
| #endif |
| @@ -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. |
|
sky
2016/04/22 15:57:07
nit: remove 'a'
hajimehoshi
2016/04/26 06:26:24
Done.
|
| +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) |
| + |
| // 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); |