Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives

chrome/browser/ui/window_sizer/window_sizer_ash_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 "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/test/shelf_test_api.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
-#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/view.h"
 #include "ui/views/view_model.h"
@@ skipping 53 matching lines @@
 #else
 #define MAYBE_OpenBrowserUsingShelfOnOtherDisplay \
   OpenBrowserUsingShelfOnOtherDisplay
 #define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay \
   OpenBrowserUsingContextMenuOnOtherDisplay
 #endif
 
 IN_PROC_BROWSER_TEST_F(WindowSizerTest,
                        MAYBE_OpenBrowserUsingShelfOnOtherDisplay) {
   // Don't shutdown when closing the last browser window.
-  chrome::IncrementKeepAliveCount();
+  ScopedKeepAlive test_keep_alive(KeepAliveOrigin::BROWSER_PROCESS_CHROMEOS,
+                                  KeepAliveRestartOption::DISABLED);
 
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
 
   BrowserList* browser_list = BrowserList::GetInstance();
 
   EXPECT_EQ(1u, browser_list->size());
   // Close the browser window so that clicking icon will create a new window.
   CloseBrowser(browser_list->get(0));
   EXPECT_EQ(0u, browser_list->size());
   EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
@@ skipping 10 matching lines @@
   CloseBrowser(browser_list->get(0));
   EXPECT_EQ(0u, browser_list->size());
 
   OpenBrowserUsingShelfOnRootWindow(root_windows[0]);
 
   // A new browser must be created on 1st display.
   EXPECT_EQ(1u, browser_list->size());
   EXPECT_EQ(root_windows[0],
             browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
   EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
-
-  // Balanced with the chrome::IncrementKeepAliveCount above.
-  chrome::DecrementKeepAliveCount();
 }
 
 namespace {
 
 class WindowSizerContextMenuTest : public WindowSizerTest {
  public:
   WindowSizerContextMenuTest() {}
   ~WindowSizerContextMenuTest() override {}
 
   static void Step1(gfx::Point release_point) {
@@ skipping 32 matching lines @@
       chrome_icon.x(), chrome_icon.y(),
       base::Bind(&WindowSizerContextMenuTest::Step1, release_point));
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(WindowSizerContextMenuTest,
                        MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay) {
   // Don't shutdown when closing the last browser window.
-  chrome::IncrementKeepAliveCount();
+  ScopedKeepAlive test_keep_alive(KeepAliveOrigin::BROWSER_PROCESS_CHROMEOS,
+                                  KeepAliveRestartOption::DISABLED);
 
   views::MenuController::TurnOffMenuSelectionHoldForTest();
 
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
 
   BrowserList* browser_list = BrowserList::GetInstance();
 
   ASSERT_EQ(1u, browser_list->size());
   EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
   CloseBrowser(browser_list->get(0));
 
   OpenBrowserUsingContextMenuOnRootWindow(root_windows[1]);
 
   // A new browser must be created on 2nd display.
   ASSERT_EQ(1u, browser_list->size());
   EXPECT_EQ(root_windows[1],
             browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
   EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
 
   OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]);
 
   // Next new browser must be created on 1st display.
   ASSERT_EQ(2u, browser_list->size());
   EXPECT_EQ(root_windows[0],
             browser_list->get(1)->window()->GetNativeWindow()->GetRootWindow());
   EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
-
-  // Balanced with the chrome::IncrementKeepAliveCount above.
-  chrome::DecrementKeepAliveCount();
 }