| Index: chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
|
| diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
|
| index f48afaa52058b9043ede0cec4936b26f1b349a54..8054c2727c4b3e07462fd6c276a4a4c9b93259d1 100644
|
| --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
|
| +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
|
| @@ -48,8 +48,9 @@ QuitWithAppsController::QuitWithAppsController()
|
| : notification_profile_(NULL), suppress_for_session_(false) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| - hosted_app_quit_notification_ = CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kHostedAppQuitNotification);
|
| + hosted_app_quit_notification_ =
|
| + base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kHostedAppQuitNotification);
|
|
|
| // There is only ever one notification to replace, so use the same replace_id
|
| // each time.
|
| @@ -124,8 +125,8 @@ bool QuitWithAppsController::ShouldQuit() {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| // Quit immediately if this is a test.
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) &&
|
| - !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) &&
|
| + !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kAppsKeepChromeAliveInTests)) {
|
| return true;
|
| }
|
|
|