Chromium Code Reviews| Index: chrome/browser/memory/tab_manager_unittest.cc |
| diff --git a/chrome/browser/memory/tab_manager_unittest.cc b/chrome/browser/memory/tab_manager_unittest.cc |
| index 9becd485d9e5b0aab3dcd096b2780c4be87f489c..4f0cb100bffbcab08dde85ad5c7f60e4366da0ea 100644 |
| --- a/chrome/browser/memory/tab_manager_unittest.cc |
| +++ b/chrome/browser/memory/tab_manager_unittest.cc |
| @@ -433,6 +433,9 @@ TEST_F(TabManagerTest, DiscardedTabKeepsLastActiveTime) { |
| EXPECT_TRUE(tabstrip.empty()); |
| } |
| +// ChildProcessNotification is disabled on ChromOS. crbug.com/588172. |
| +#if !defined(OS_CHROMEOS) |
|
sky
2016/04/04 23:46:35
Can you conditionally run the test? By that I mean
oshima
2016/04/04 23:49:25
Done.
|
| + |
| namespace { |
| using MemoryPressureLevel = base::MemoryPressureListener::MemoryPressureLevel; |
| @@ -591,4 +594,6 @@ TEST_F(TabManagerTest, ChildProcessNotifications) { |
| ASSERT_TRUE(tabstrip.empty()); |
| } |
| +#endif |
| + |
| } // namespace memory |