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..a5f2a6afba5a4f345031b031dcd08fa2a3d807b4 100644 |
| --- a/chrome/browser/memory/tab_manager_unittest.cc |
| +++ b/chrome/browser/memory/tab_manager_unittest.cc |
| @@ -451,8 +451,15 @@ MemoryPressureLevel ReturnSpecifiedPressure( |
| } // namespace |
| +// ChildProcessNotification is disabled on ChromOS. crbug.com/588172. |
|
sky
2016/04/04 23:51:37
nit: ChromeOS
oshima
2016/04/05 00:03:50
Done.
|
| +#if !defined(OS_CHROMEOS) |
| +#define MAYBE_ChildProcessNotifications DISABLED_ChildProcessNotifications |
| +#else |
| +#define MAYBE_ChildProcessNotifications ChildProcessNotifications |
| +#endif |
| + |
| // Ensure that memory pressure notifications are forwarded to child processes. |
| -TEST_F(TabManagerTest, ChildProcessNotifications) { |
| +TEST_F(TabManagerTest, MAYBE_ChildProcessNotifications) { |
| TabManager tm; |
| // Set up the tab strip. |