Replace BrowserProces::AddRefModule/RemoveModule by ScopedKeepAlive

chrome/browser/apps/app_window_interactive_uitest.cc

 // Copyright 2013 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 "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/lifetime/keep_alive_registry.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "ui/base/test/scoped_fake_nswindow_fullscreen.h"
@@ skipping 501 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppWindowHiddenKeepAliveTest);
 };
 
 // A window that becomes hidden should not keep Chrome alive.
 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHidden) {
   LoadAndLaunchPlatformApp("minimal", "Launched");
   for (auto* browser : *BrowserList::GetInstance())
     browser->window()->Close();
-
-  EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());

[dgn, 2016/03/16 15:10:50]

IsKeepingAlive now includes the browser windows as well. This test is concerned
about the keepalives related to the delegate only, so I made that accessible
instead.

+  EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
+      KeepAliveOrigin::CHROME_APP_DELEGATE));
   GetFirstAppWindow()->Hide();
-  EXPECT_FALSE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
+  EXPECT_FALSE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
+      KeepAliveOrigin::CHROME_APP_DELEGATE));
 }
 
 // A window that is hidden but re-shown should still keep Chrome alive.
 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHiddenThenShown) {
   LoadAndLaunchPlatformApp("minimal", "Launched");
   AppWindow* app_window = GetFirstAppWindow();
   app_window->Hide();
   app_window->Show(AppWindow::SHOW_ACTIVE);
 
-  EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
+  EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
+      KeepAliveOrigin::CHROME_APP_DELEGATE));
   for (auto* browser : *BrowserList::GetInstance())
     browser->window()->Close();
-  EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
+  EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
+      KeepAliveOrigin::CHROME_APP_DELEGATE));
   app_window->GetBaseWindow()->Close();
 }
 
 // A window that is created hidden and stays hidden should not keep Chrome
 // alive.
 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, StaysHidden) {
   LoadAndLaunchPlatformApp("hidden", "Launched");
   AppWindow* app_window = GetFirstAppWindow();
   EXPECT_TRUE(app_window->is_hidden());
 
@@ skipping 13 matching lines @@
 
   // Close all browser windows.
   for (auto* browser : *BrowserList::GetInstance())
     browser->window()->Close();
 
   // The app window will show after 3 seconds.
   ExtensionTestMessageListener shown_listener("Shown", false);
   launched_listener.Reply("");
   EXPECT_TRUE(shown_listener.WaitUntilSatisfied());
   EXPECT_FALSE(app_window->is_hidden());
-  EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
+  EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
+      KeepAliveOrigin::CHROME_APP_DELEGATE));
   app_window->GetBaseWindow()->Close();
 }
 
 #endif