Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1146)

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

Issue 1803143002: Replace BrowserProces::AddRefModule/RemoveModule by ScopedKeepAlive (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
index 1f8c4d20859293117456b738e08f0271c9e1bfdd..88e439034f1d68027db18a7a582559e34e2067a6 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
@@ -10,6 +10,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/win/windows_version.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
#include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
#include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -109,7 +111,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
SessionStartupPref::SetStartupPref(profile, pref);
// Keep the browser process running while browsers are closed.
- g_browser_process->AddRefModule();
+ ScopedKeepAlive keep_alive(KeepAliveOrigin::BROWSER,
+ KeepAliveRestartOption::DISABLED);
// Close the browser.
CloseBrowserAsynchronously(browser());
@@ -138,8 +141,6 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
ASSERT_EQ(static_cast<int>(expected_urls.size()), tab_strip->count());
for (size_t i = 0; i < expected_urls.size(); i++)
EXPECT_EQ(expected_urls[i], tab_strip->GetWebContentsAt(i)->GetURL());
-
- g_browser_process->ReleaseModule();
}
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
@@ -188,7 +189,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
SessionStartupPref::SetStartupPref(browser()->profile(), pref);
// Keep the browser process running while browsers are closed.
- g_browser_process->AddRefModule();
+ ScopedKeepAlive keep_alive(KeepAliveOrigin::BROWSER,
+ KeepAliveRestartOption::DISABLED);
// Close the browser.
CloseBrowserAsynchronously(browser());
@@ -248,5 +250,4 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
ASSERT_LT(0, other_tab_strip->count());
EXPECT_EQ(internals::GetTriggeredResetSettingsURL(),
other_tab_strip->GetActiveWebContents()->GetURL());
- g_browser_process->ReleaseModule();
}
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_browsertest.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698