Enable batched browser shutdown by default.

BUG=265764

Review URL: https://codereview.chromium.org/25842005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227473 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 18 insertions, 19 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 4e967f6..bc91a0a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5773,11 +5773,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_APP_WINDOW_CONTROLS_DESCRIPTION" desc="Description of the 'Enable 'window-controls' element' lab.">
         Enables using 'window-controls' HTML elements in packaged apps.
       </message>
-      <message name="IDS_FLAGS_ENABLE_BATCHED_SHUTDOWN_DESCRIPTION" desc="Description of the 'Batched shutdown' lab.">
-        Enabling this options delays closing browser windows during shutdown until the shutdown is no longer cancellable.
+      <message name="IDS_FLAGS_DISABLE_BATCHED_SHUTDOWN_DESCRIPTION" desc="Description of the 'Batched shutdown' lab.">
+        Disables delaying closing browser windows during shutdown until shutdown is no longer cancellable.
       </message>
-      <message name="IDS_FLAGS_ENABLE_BATCHED_SHUTDOWN_NAME" desc="Name of the 'Batched shutdown' lab.">
-        Enable batched browser shutdown
+      <message name="IDS_FLAGS_DISABLE_BATCHED_SHUTDOWN_NAME" desc="Name of the 'Batched shutdown' lab.">
+        Disable batched browser shutdown
       </message>
       <message name="IDS_FLAGS_SCRIPT_BADGES_NAME" desc="Name of the 'Script Badges' lab.">
         Script badges
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 6f8c4f1..319b192 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1707,11 +1707,11 @@ const Experiment kExperiments[] = {
   },
 #endif
   {
-    "enable-batched-shutdown",
-    IDS_FLAGS_ENABLE_BATCHED_SHUTDOWN_NAME,
-    IDS_FLAGS_ENABLE_BATCHED_SHUTDOWN_DESCRIPTION,
+    "disable-batched-shutdown",
+    IDS_FLAGS_DISABLE_BATCHED_SHUTDOWN_NAME,
+    IDS_FLAGS_DISABLE_BATCHED_SHUTDOWN_DESCRIPTION,
     kOsDesktop,
-    SINGLE_VALUE_TYPE(switches::kEnableBatchedShutdown)
+    SINGLE_VALUE_TYPE(switches::kDisableBatchedShutdown)
   },
   {
     "map-image",
diff --git a/chrome/browser/lifetime/browser_close_manager.cc b/chrome/browser/lifetime/browser_close_manager.cc
index aa6f0fd..49d6531 100644
--- a/chrome/browser/lifetime/browser_close_manager.cc
+++ b/chrome/browser/lifetime/browser_close_manager.cc
@@ -30,8 +30,8 @@ void BrowserCloseManager::StartClosingBrowsers() {
   // wait for beforeunload dialogs; in the latter, the windows will manage
   // showing their own dialogs.
   if (browser_shutdown::GetShutdownType() == browser_shutdown::END_SESSION ||
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableBatchedShutdown)) {
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableBatchedShutdown)) {
     CloseBrowsers();
     return;
   }
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 7b39cd7..ce61b24 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -175,7 +175,6 @@ class BrowserCloseManagerBrowserTest
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    command_line->AppendSwitch(switches::kEnableBatchedShutdown);
     if (GetParam())
       command_line->AppendSwitch(switches::kEnableFastUnload);
   }
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc
index 758d79e..651f007 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc
@@ -119,10 +119,10 @@ void JavaScriptAppModalDialog::Invalidate() {
 void JavaScriptAppModalDialog::OnCancel(bool suppress_js_messages) {
   // If we are shutting down and this is an onbeforeunload dialog, cancel the
   // shutdown.
-  // TODO(sammc): Remove this when kEnableBatchedShutdown becomes mandatory.
+  // TODO(sammc): Remove this when kDisableBatchedShutdown is removed.
   if (is_before_unload_dialog_ &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableBatchedShutdown)) {
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableBatchedShutdown)) {
     browser_shutdown::SetTryingToQuit(false);
   }
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9db93de..f4a01be 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -299,6 +299,10 @@ const char kDisableBackgroundMode[]         = "disable-background-mode";
 // measurements.
 const char kDisableBackgroundNetworking[]   = "disable-background-networking";
 
+// Disables running all beforeunload handlers before closing any browser windows
+// on shutdown.
+const char kDisableBatchedShutdown[]        = "disable-batched-shutdown";
+
 // Disables the bundled PPAPI version of Flash.
 const char kDisableBundledPpapiFlash[]      = "disable-bundled-ppapi-flash";
 
@@ -566,10 +570,6 @@ const char kEnablePasswordAutofillPublicSuffixDomainMatching[] =
 // GAIA login page, an info bar can help the user login.
 const char kEnableAutologin[]               = "enable-autologin";
 
-// Enables running all beforeunload handlers before closing any browser windows
-// on shutdown.
-const char kEnableBatchedShutdown[]         = "enable-batched-shutdown";
-
 // Enables the benchmarking extensions.
 const char kEnableBenchmarking[]            = "enable-benchmarking";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index e834001..5e7b4c62 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -93,6 +93,7 @@ extern const char kDisableAsyncDns[];
 extern const char kDisableAuthNegotiateCnameLookup[];
 extern const char kDisableBackgroundMode[];
 extern const char kDisableBackgroundNetworking[];
+extern const char kDisableBatchedShutdown[];
 extern const char kDisableBundledPpapiFlash[];
 extern const char kDisableBookmarkAutocompleteProvider[];
 extern const char kDisableClientSidePhishingDetection[];
@@ -169,7 +170,6 @@ extern const char kEnableAppWindowControls[];
 extern const char kEnableAsyncDns[];
 extern const char kEnableAuthNegotiatePort[];
 extern const char kEnableAutologin[];
-extern const char kEnableBatchedShutdown[];
 extern const char kEnableBenchmarking[];
 extern const char kEnableClientHints[];
 extern const char kEnableCloudPolicyPush[];