Removed --disable-background-mode/restore-background-contents flags.

BUG=350898

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

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

chrome/browser/background/background_contents_service.cc

@@ -263,10 +263,8 @@ int BackgroundContentsService::restart_delay_in_ms_ = 3000;  // 3 seconds.
 BackgroundContentsService::BackgroundContentsService(
     Profile* profile, const CommandLine* command_line)
     : prefs_(NULL) {
-  // Don't load/store preferences if the proper switch is not enabled, or if
-  // the parent profile is incognito.
-  if (!profile->IsOffTheRecord() &&
-      !command_line->HasSwitch(switches::kDisableRestoreBackgroundContents))
+  // Don't load/store preferences if the parent profile is incognito.
+  if (!profile->IsOffTheRecord())
     prefs_ = profile->GetPrefs();
 
   // Listen for events to tell us when to load/unload persisted background

chrome/browser/prefs/command_line_pref_store.cc

@@ -170,8 +170,7 @@ void CommandLinePrefStore::ApplySSLSwitches() {
 }
 
 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
-  if (command_line_->HasSwitch(switches::kDisableBackgroundMode) ||
-      command_line_->HasSwitch(switches::kDisableExtensions)) {
+  if (command_line_->HasSwitch(switches::kDisableExtensions)) {
     base::Value* value = base::Value::CreateBooleanValue(false);
     SetValue(prefs::kBackgroundModeEnabled, value);
   }

chrome/common/chrome_switches.cc

@@ -215,10 +215,6 @@ const char kDisableAsyncDns[]               = "disable-async-dns";
 const char kDisableAuthNegotiateCnameLookup[] =
     "disable-auth-negotiate-cname-lookup";
 
-// Disables background mode (background apps will not keep chrome running in
-// the background).
-const char kDisableBackgroundMode[]         = "disable-background-mode";
-
 // Disable several subsystems which run network requests in the background.
 // This is for use when doing network performance testing to avoid noise in the
 // measurements.
@@ -352,11 +348,6 @@ const char kDisableQuicPortSelection[]      = "disable-quic-port-selection";
 const char kDisableQuicTimeBasedLossDetection[] =
     "disable-quic-time-based-loss-detection";
 
-// Prevents the URLs of BackgroundContents from being remembered and
-// re-launched when the browser restarts.
-const char kDisableRestoreBackgroundContents[] =
-    "disable-restore-background-contents";
-
 // Prevents the save password bubble from being enabled.
 const char kDisableSavePasswordBubble[] = "disable-save-password-bubble";
 

chrome/common/chrome_switches.h

@@ -70,7 +70,6 @@ extern const char kDiagnosticsFormat[];
 extern const char kDiagnosticsRecovery[];
 extern const char kDisableAsyncDns[];
 extern const char kDisableAuthNegotiateCnameLookup[];
-extern const char kDisableBackgroundMode[];
 extern const char kDisableBackgroundNetworking[];
 extern const char kDisableBundledPpapiFlash[];
 extern const char kDisableClientSidePhishingDetection[];
@@ -105,7 +104,6 @@ extern const char kDisableQuicHttps[];
 extern const char kDisableQuicPacing[];
 extern const char kDisableQuicPortSelection[];
 extern const char kDisableQuicTimeBasedLossDetection[];
-extern const char kDisableRestoreBackgroundContents[];
 extern const char kDisableSavePasswordBubble[];
 extern const char kDisableSearchButtonInOmnibox[];
 extern const char kDisableSessionCrashedBubble[];

cloud_print/service/win/chrome_launcher.cc

@@ -209,7 +209,6 @@ void ChromeLauncher::Run() {
 
       // Optional.
       cmd.AppendSwitch(switches::kAutoLaunchAtStartup);
-      cmd.AppendSwitch(switches::kDisableBackgroundMode);
       cmd.AppendSwitch(switches::kDisableDefaultApps);
       cmd.AppendSwitch(switches::kDisableExtensions);
       cmd.AppendSwitch(switches::kDisableGpu);
@@ -284,7 +283,6 @@ std::string ChromeLauncher::CreateServiceStateFile(
   cmd.AppendSwitch(switches::kNoServiceAutorun);
 
   // Optional.
-  cmd.AppendSwitch(switches::kDisableBackgroundMode);
   cmd.AppendSwitch(switches::kDisableDefaultApps);
   cmd.AppendSwitch(switches::kDisableExtensions);
   cmd.AppendSwitch(switches::kDisableSync);
@@ -320,4 +318,3 @@ std::string ChromeLauncher::CreateServiceStateFile(
     }
   }
 }
-