Fixing flakiness of 2 AppActivityTest's

athena/content/app_activity_unittest.cc

 /// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/extensions/public/extensions_delegate.h"
@@ skipping 292 matching lines @@
   // Close the proxy object and make sure that nothing bad happens.
   DeleteActivity(activity_proxy);
 
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
   EXPECT_EQ(1, test_extensions_delegate()->unload_called());
   EXPECT_EQ(0, test_extensions_delegate()->restart_called());
 }
 
 // Test that when unloading an app while multiple apps / activities are present,
 // the proxy gets created in the correct location.
-// Flaky: http://crbug.com/416843.
-TEST_F(AppActivityTest, DISABLED_TestUnloadProxyLocation) {
+TEST_F(AppActivityTest, TestUnloadProxyLocation) {
+  // Disable the resource manager since some build bots run this test for an
+  // extended amount of time which allows the MemoryPressureNotifier to fire.
+  DisableResourceManager();
   // Set up some activities for some applications.
   TestAppActivity* app_activity1a = CreateAppActivity(kDummyApp1);
   TestAppActivity* app_activity2a = CreateAppActivity(kDummyApp2);
   TestAppActivity* app_activity2b = CreateAppActivity(kDummyApp2);
   TestAppActivity* app_activity1b = CreateAppActivity(kDummyApp1);
   EXPECT_EQ(3, GetActivityPosition(app_activity1b));
   EXPECT_EQ(2, GetActivityPosition(app_activity2b));
   EXPECT_EQ(1, GetActivityPosition(app_activity2a));
   EXPECT_EQ(0, GetActivityPosition(app_activity1a));
 
@@ skipping 12 matching lines @@
   EXPECT_EQ(0, GetActivityPosition(app_activity1a));
   EXPECT_EQ(0, test_extensions_delegate()->restart_called());
 
   DeleteActivity(activity_proxy);
   DeleteActivity(app_activity1b);
   DeleteActivity(app_activity1a);
 }
 
 // Test that an unload with multiple activities of the same app will only unload
 // when all activities were marked for unloading.
-// Flaky: http://crbug.com/417189.
-TEST_F(AppActivityTest, DISABLED_TestMultipleActivityUnloadLock) {
+TEST_F(AppActivityTest, TestMultipleActivityUnloadLock) {
+  // Disable the resource manager since some build bots run this test for an
+  // extended amount of time which allows the MemoryPressureNotifier to fire.
+  DisableResourceManager();
+
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
 
   TestAppActivity* app_activity1 = CreateAppActivity(kDummyApp1);
   TestAppActivity* app_activity2 = CreateAppActivity(kDummyApp1);
   TestAppActivity* app_activity3 = CreateAppActivity(kDummyApp1);
 
   // Check that we have 3 activities of the same application.
   EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
   AppActivityRegistry* app_activity_registry =
       app_activity1->app_activity_registry();
@@ skipping 62 matching lines @@
   // However - the restart in this test framework does not really restart and
   // all objects should be still there..
   EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
   EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy());
   Activity::Delete(app_activity_registry->unloaded_activity_proxy());
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
 }
 
 }  // namespace test
 }  // namespace athena