| Index: athena/content/app_activity_unittest.cc
|
| diff --git a/athena/content/app_activity_unittest.cc b/athena/content/app_activity_unittest.cc
|
| index 0de0e1a517c14dcb80e92c5bafec047a7d283ad3..2078df7eac95f4205402dac353cb6645b22f5920 100644
|
| --- a/athena/content/app_activity_unittest.cc
|
| +++ b/athena/content/app_activity_unittest.cc
|
| @@ -343,7 +343,8 @@ TEST_F(AppActivityTest, TestUnloadProxyLocation) {
|
|
|
| // Test that an unload with multiple activities of the same app will only unload
|
| // when all activities were marked for unloading.
|
| -TEST_F(AppActivityTest, TestMultipleActivityUnloadLock) {
|
| +// Flaky: http://crbug.com/417189.
|
| +TEST_F(AppActivityTest, DISABLED_TestMultipleActivityUnloadLock) {
|
| EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
|
|
|
| TestAppActivity* app_activity1 = CreateAppActivity(kDummyApp1);
|
|
|