| 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..e2490708f1c7369e782cbe581520ca06769af530 100644
|
| --- a/athena/content/app_activity_unittest.cc
|
| +++ b/athena/content/app_activity_unittest.cc
|
| @@ -310,7 +310,8 @@ TEST_F(AppActivityTest, TestUnloadFollowedByClose) {
|
|
|
| // Test that when unloading an app while multiple apps / activities are present,
|
| // the proxy gets created in the correct location.
|
| -TEST_F(AppActivityTest, TestUnloadProxyLocation) {
|
| +// Flaky: http://crbug.com/416843.
|
| +TEST_F(AppActivityTest, DISABLED_TestUnloadProxyLocation) {
|
| // Set up some activities for some applications.
|
| TestAppActivity* app_activity1a = CreateAppActivity(kDummyApp1);
|
| TestAppActivity* app_activity2a = CreateAppActivity(kDummyApp2);
|
|
|