chrome/browser/lifetime/browser_close_manager_browsertest.cc - Issue 25603004: Leave apps running on Windows and Linux when quitting Chrome from the wrench menu.

Unified Diff: chrome/browser/lifetime/browser_close_manager_browsertest.cc

Issue 25603004: Leave apps running on Windows and Linux when quitting Chrome from the wrench menu. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 7 years, 2 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/lifetime/browser_close_manager_browsertest.cc

diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc

index ce61b244028c4b7e4ea4a2f1fbdc7fe02d91fae3..20e3d58899798501f8d1a14fe1c0f81e187e5a7c 100644

--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc

+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc

@@ -5,6 +5,7 @@

#include <vector>

#include "base/command_line.h"

+#include "chrome/browser/background/background_mode_manager.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_shutdown.h"

#include "chrome/browser/chrome_notification_types.h"

@@ -17,6 +18,7 @@

#include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"

#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"

#include "chrome/browser/ui/browser.h"

+#include "chrome/browser/ui/browser_commands.h"

#include "chrome/browser/ui/browser_iterator.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

@@ -126,6 +128,7 @@ class TestBrowserCloseManager : public BrowserCloseManager {

static void AttemptClose(UserChoice user_choice) {

scoped_refptr<BrowserCloseManager> browser_close_manager =

new TestBrowserCloseManager(user_choice);

+ browser_shutdown::SetTryingToQuit(true);

browser_close_manager->StartClosingBrowsers();

}

@@ -156,6 +159,34 @@ class TestBrowserCloseManager : public BrowserCloseManager {

DISALLOW_COPY_AND_ASSIGN(TestBrowserCloseManager);

};

+class FakeBackgroundModeManager : public BackgroundModeManager {

+ public:

+ FakeBackgroundModeManager()

+ : BackgroundModeManager(

+ CommandLine::ForCurrentProcess(),

+ &g_browser_process->profile_manager()->GetProfileInfoCache()),

+ suspended_(false) {}

+ virtual void SuspendBackgroundMode() OVERRIDE {

+ BackgroundModeManager::SuspendBackgroundMode();

+ suspended_ = true;

+ }

+ virtual void ResumeBackgroundMode() OVERRIDE {

+ BackgroundModeManager::ResumeBackgroundMode();

+ suspended_ = false;

+ }

+ bool IsBackgroundModeSuspended() {

+ return suspended_;

+ }

+ private:

+ bool suspended_;

+ DISALLOW_COPY_AND_ASSIGN(FakeBackgroundModeManager);

+};

} // namespace

class BrowserCloseManagerBrowserTest

@@ -203,7 +234,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestSingleTabShutdown) {

browser(), embedded_test_server()->GetURL("/beforeunload.html")));

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.CancelClose());

cancel_observer.Wait();

EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

@@ -211,7 +242,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestSingleTabShutdown) {

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

close_observer.Wait();

EXPECT_TRUE(browser_shutdown::IsTryingToQuit());

@@ -225,8 +256,8 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

browser(), embedded_test_server()->GetURL("/beforeunload.html")));

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.CancelClose());

cancel_observer.Wait();

EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

@@ -234,8 +265,8 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

close_observer.Wait();

EXPECT_TRUE(browser_shutdown::IsTryingToQuit());

@@ -251,7 +282,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, PRE_TestSessionRestore) {

ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIAboutURL)));

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.CancelClose());

cancel_observer.Wait();

EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

@@ -270,7 +301,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, PRE_TestSessionRestore) {

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

close_observer.Wait();

EXPECT_TRUE(browser_shutdown::IsTryingToQuit());

EXPECT_TRUE(chrome::BrowserIterator().done());

@@ -301,7 +332,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestMultipleWindows) {

{

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.CancelClose());

cancel_observer.Wait();

}

@@ -313,7 +344,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestMultipleWindows) {

{

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

ASSERT_NO_FATAL_FAILURE(dialogs_.CancelClose());

cancel_observer.Wait();

@@ -325,7 +356,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestMultipleWindows) {

// Allow shutdown for both beforeunload events.

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

close_observer.Wait();

EXPECT_TRUE(browser_shutdown::IsTryingToQuit());

@@ -357,7 +388,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.CancelClose());

cancel_observer.Wait();

EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

@@ -366,7 +397,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

close_observer.Wait();

EXPECT_TRUE(browser_shutdown::IsTryingToQuit());

@@ -390,7 +421,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.CancelClose());

cancel_observer.Wait();

EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

@@ -401,7 +432,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 3);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

close_observer.Wait();

EXPECT_TRUE(browser_shutdown::IsTryingToQuit());

@@ -417,7 +448,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

browsers_.push_back(CreateBrowser(browser()->profile()));

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

close_observer.Wait();

@@ -435,7 +466,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

browsers_.push_back(CreateBrowser(browser()->profile()));

ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(

browsers_[1], embedded_test_server()->GetURL("/beforeunload.html")));

@@ -449,7 +480,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

// Allow shutdown for both beforeunload dialogs.

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

close_observer.Wait();

EXPECT_TRUE(browser_shutdown::IsTryingToQuit());

@@ -468,7 +499,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

AddBlankTabAndShow(browsers_[0]);

AddBlankTabAndShow(browsers_[1]);

@@ -490,7 +521,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

browsers_[1], embedded_test_server()->GetURL("/beforeunload.html")));

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

AddBlankTabAndShow(browsers_[0]);

ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(

@@ -507,7 +538,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

@@ -523,7 +554,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

browsers_.push_back(CreateBrowser(browser()->profile()));

ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(

@@ -538,7 +569,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

browsers_[1]->tab_strip_model()->CloseAllTabs();

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

@@ -563,7 +594,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

browsers_.push_back(CreateBrowser(browser()->profile()));

ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(

@@ -578,7 +609,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_FALSE(browsers_[1]->ShouldCloseWindow());

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

@@ -598,7 +629,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

browsers_[1], embedded_test_server()->GetURL("/beforeunload.html")));

RepeatedNotificationObserver cancel_observer(

chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, 1);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_FALSE(browsers_[0]->ShouldCloseWindow());

ASSERT_NO_FATAL_FAILURE(dialogs_.CancelClose());

@@ -609,7 +640,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

RepeatedNotificationObserver close_observer(

chrome::NOTIFICATION_BROWSER_CLOSED, 2);

- chrome::CloseAllBrowsers();

+ chrome::CloseAllBrowsersAndQuit();

ASSERT_FALSE(browsers_[0]->ShouldCloseWindow());

ASSERT_NO_FATAL_FAILURE(dialogs_.AcceptClose());

@@ -718,3 +749,98 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,

INSTANTIATE_TEST_CASE_P(BrowserCloseManagerBrowserTest,

BrowserCloseManagerBrowserTest,

testing::Bool());

+class BrowserCloseManagerWithBackgroundModeBrowserTest

+ : public BrowserCloseManagerBrowserTest {

+ public:

+ BrowserCloseManagerWithBackgroundModeBrowserTest() {}

+ virtual void SetUpOnMainThread() OVERRIDE {

+ BrowserCloseManagerBrowserTest::SetUpOnMainThread();

+ g_browser_process->set_background_mode_manager_for_test(

+ scoped_ptr<BackgroundModeManager>(new FakeBackgroundModeManager));

+ }

+ bool IsBackgroundModeSuspended() {

+ return static_cast<FakeBackgroundModeManager*>(

+ g_browser_process->background_mode_manager())

+ ->IsBackgroundModeSuspended();

+ }

+ private:

+ DISALLOW_COPY_AND_ASSIGN(BrowserCloseManagerWithBackgroundModeBrowserTest);

+};

+// Check that background mode is suspended when closing all browsers unless we

+// are quitting and that background mode is resumed when a new browser window is

+// opened.

+IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithBackgroundModeBrowserTest,

+ CloseAllBrowsersWithBackgroundMode) {

+ EXPECT_FALSE(IsBackgroundModeSuspended());

+ Profile* profile = browser()->profile();

+ {

+ RepeatedNotificationObserver close_observer(

+ chrome::NOTIFICATION_BROWSER_CLOSED, 1);

+ chrome::StartKeepAlive();

+ chrome::CloseAllBrowsers();

+ close_observer.Wait();

+ }

+ EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

+ EXPECT_TRUE(chrome::BrowserIterator().done());

+ EXPECT_TRUE(IsBackgroundModeSuspended());

+ // Background mode should be resumed when a new browser window is opened.

+ ui_test_utils::BrowserAddedObserver new_browser_observer;

+ chrome::NewEmptyWindow(profile, chrome::HOST_DESKTOP_TYPE_NATIVE);

+ new_browser_observer.WaitForSingleNewBrowser();

+ chrome::EndKeepAlive();

+ EXPECT_FALSE(IsBackgroundModeSuspended());

+ RepeatedNotificationObserver close_observer(

+ chrome::NOTIFICATION_BROWSER_CLOSED, 1);

+ // Background mode should not be suspended when quitting.

+ chrome::CloseAllBrowsersAndQuit();

+ close_observer.Wait();

+ EXPECT_TRUE(browser_shutdown::IsTryingToQuit());

+ EXPECT_TRUE(chrome::BrowserIterator().done());

+ EXPECT_FALSE(IsBackgroundModeSuspended());

+// Check that closing the last browser window individually does not affect

+// background mode.

+IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithBackgroundModeBrowserTest,

+ CloseSingleBrowserWithBackgroundMode) {

+ RepeatedNotificationObserver close_observer(

+ chrome::NOTIFICATION_BROWSER_CLOSED, 1);

+ EXPECT_FALSE(IsBackgroundModeSuspended());

+ browser()->window()->Close();

+ close_observer.Wait();

+ EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

+ EXPECT_TRUE(chrome::BrowserIterator().done());

+ EXPECT_FALSE(IsBackgroundModeSuspended());

+// Check that closing all browsers with no browser windows open suspends

+// background mode but does not cause Chrome to quit.

+IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithBackgroundModeBrowserTest,

+ CloseAllBrowsersWithNoOpenBrowsersWithBackgroundMode) {

+ RepeatedNotificationObserver close_observer(

+ chrome::NOTIFICATION_BROWSER_CLOSED, 1);

+ EXPECT_FALSE(IsBackgroundModeSuspended());

+ chrome::StartKeepAlive();

+ browser()->window()->Close();

+ close_observer.Wait();

+ EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

+ EXPECT_TRUE(chrome::BrowserIterator().done());

+ EXPECT_FALSE(IsBackgroundModeSuspended());

+ chrome::CloseAllBrowsers();

+ EXPECT_FALSE(browser_shutdown::IsTryingToQuit());

+ EXPECT_TRUE(chrome::BrowserIterator().done());

+ EXPECT_TRUE(IsBackgroundModeSuspended());

+INSTANTIATE_TEST_CASE_P(BrowserCloseManagerWithBackgroundModeBrowserTest,

+ BrowserCloseManagerWithBackgroundModeBrowserTest,

+ testing::Bool());

« chrome/browser/background/background_mode_manager.cc ('K') | « chrome/browser/lifetime/browser_close_manager.cc ('k') | no next file » | no next file with comments »