Enable BackgroundMode by default on all non-cros platforms.

BUG=59980
TEST=existing tests suffice

Review URL: http://codereview.chromium.org/6087003

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

6 files changed, 7 insertions, 30 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cbb8079..4a39c60 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4114,12 +4114,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_XSS_AUDITOR_DESCRIPTION" desc="Description of the 'XSS Auditor' lab.">
         Enables WebKit's XSS Auditor (cross-site scripting protection). This feature aims to protect you from certain attacks of malicious web sites. It improves your security, but it might not be compatible with all web sites.
       </message>
-      <message name="IDS_FLAGS_BACKGROUND_WEBAPPS_NAME" desc="Name of the 'Background WebApps' lab.">
-        Background WebApps
-      </message>
-      <message name="IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION" desc="Description of the 'Background WebApps' lab.">
-        Allows installed web apps to run in the background at system startup and continue running after all windows are closed.
-      </message>
       <message name="IDS_FLAGS_CLOUD_PRINT_PROXY_NAME" desc="Title of the Cloud Print Proxy lab">
         Cloud Print Proxy
       </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 5085859..a37f7a3 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -152,13 +152,6 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kEnableXSSAuditor)
   },
   {
-    "background-webapps",  // FLAGS:RECORD_UMA
-    IDS_FLAGS_BACKGROUND_WEBAPPS_NAME,
-    IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION,
-    kOsLinux,  // Enabled by default on windows and mac, not available on CrOS.
-    SINGLE_VALUE_TYPE(switches::kEnableBackgroundMode)
-  },
-  {
     "conflicting-modules-check",  // FLAGS:RECORD_UMA
     IDS_FLAGS_CONFLICTS_CHECK_NAME,
     IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION,
diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc
index 74c0df6..3af5779 100644
--- a/chrome/browser/background_mode_manager.cc
+++ b/chrome/browser/background_mode_manager.cc
@@ -364,16 +364,14 @@ bool BackgroundModeManager::IsBackgroundModeEnabled(
     const CommandLine* command_line) {
 
   // Background mode is disabled if the appropriate flag is passed, or if
-  // extensions are disabled.
+  // extensions are disabled. It's always disabled on chromeos since chrome
+  // is always running on that platform, making it superfluous.
+#if defined(OS_CHROMEOS)
+  return false;
+#else
   bool background_mode_enabled =
       !command_line->HasSwitch(switches::kDisableBackgroundMode) &&
       !command_line->HasSwitch(switches::kDisableExtensions);
-#if !(defined(OS_WIN) || defined(OS_MACOSX))
-  // BackgroundMode is enabled by default on windows and mac. On other
-  // platforms, it is enabled via about:flags.
-  background_mode_enabled = background_mode_enabled &&
-      command_line->HasSwitch(switches::kEnableBackgroundMode);
-#endif
-
   return background_mode_enabled;
+#endif
 }
diff --git a/chrome/browser/background_mode_manager_unittest.cc b/chrome/browser/background_mode_manager_unittest.cc
index 989c72d..d47d8e0 100644
--- a/chrome/browser/background_mode_manager_unittest.cc
+++ b/chrome/browser/background_mode_manager_unittest.cc
@@ -21,7 +21,6 @@ class BackgroundModeManagerTest : public testing::Test {
   ~BackgroundModeManagerTest() {}
   void SetUp() {
     command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM));
-    command_line_->AppendSwitch(switches::kEnableBackgroundMode);
   }
   scoped_ptr<CommandLine> command_line_;
 };
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index df8e12c..2093c69 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -167,8 +167,7 @@ const char kDisableAuthNegotiateCnameLookup[] =
     "disable-auth-negotiate-cname-lookup";
 
 // Disable background mode (background apps will not keep chrome running in the
-// background). This has priority over the kEnableBackgroundMode flag which is
-// settable via about:labs.
+// background).
 const char kDisableBackgroundMode[] = "disable-background-mode";
 
 // Disable several subsystems which run network requests in the background.
@@ -413,11 +412,6 @@ const char kEnableAeroPeekTabs[]            = "enable-aero-peek-tabs";
 // for more background.
 const char kEnableAuthNegotiatePort[]       = "enable-auth-negotiate-port";
 
-// Enable background mode (background apps will keep chrome running in the
-// background and allow chrome to launch on startup). Has no effect on Windows
-// because background mode is enabled there by default.
-const char kEnableBackgroundMode[] = "enable-background-mode";
-
 // Enables the benchmarking extensions.
 const char kEnableBenchmarking[]            = "enable-benchmarking";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1270ac4..dff6717 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -124,7 +124,6 @@ extern const char kEnableAcceleratedLayers[];
 extern const char kEnableAccessibility[];
 extern const char kEnableAeroPeekTabs[];
 extern const char kEnableAuthNegotiatePort[];
-extern const char kEnableBackgroundMode[];
 extern const char kEnableBenchmarking[];
 extern const char kEnableBlockContentAnimation[];
 extern const char kEnableClientSidePhishingDetection[];