Multi-profile flag cleanup

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/login_utils.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 137 matching lines @@
       OAuth2LoginManager::SessionRestoreState state) OVERRIDE;
   virtual void OnNewRefreshTokenAvaiable(Profile* user_profile) OVERRIDE;
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver overrides.
   virtual void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
  private:
   typedef std::set<std::string> SessionRestoreStateSet;
 
+  // Removes obsolete about://flags entries from user profile preferences.
+  void RemoveObsoleteFlags(PrefService* prefs);
+
   // DoBrowserLaunch is split into two parts.
   // This one is called after anynchronous locale switch.
   void DoBrowserLaunchOnLocaleLoadedImpl(Profile* profile,
                                          LoginDisplayHost* login_host);
 
   // Callback for locale_util::SwitchLanguage().
   static void DoBrowserLaunchOnLocaleLoaded(
       scoped_ptr<DoBrowserLaunchOnLocaleLoadedData> context,
       const std::string& locale,
       const std::string& loaded_locale,
@@ skipping 122 matching lines @@
 // static
 void LoginUtilsImpl::DoBrowserLaunchOnLocaleLoaded(
     scoped_ptr<DoBrowserLaunchOnLocaleLoadedData> context,
     const std::string& /* locale */,
     const std::string& /* loaded_locale */,
     const bool /* success */) {
   context->login_utils_impl->DoBrowserLaunchOnLocaleLoadedImpl(
       context->profile, context->display_host);
 }
 
+void LoginUtilsImpl::RemoveObsoleteFlags(PrefService* prefs) {
+  about_flags::PrefServiceFlagsStorage flags_storage(prefs);
+  std::set<std::string> flags = flags_storage.GetFlags();
+  bool removed_any = false;
+  // Entries from about://flags that we need to remove since they are obsolete.
+  const char* const kObsoleteSwitchesToRemove[] = {
+    ::switches::kMultiProfilesObsolete,
+  };
+  for (size_t i = 0; i < arraysize(kObsoleteSwitchesToRemove); ++i) {
+    std::set<std::string>::iterator iter =
+        flags.find(kObsoleteSwitchesToRemove[i]);
+    if (iter != flags.end()) {
+      flags.erase(iter);
+      removed_any = true;
+    }
+  }
+  if (removed_any)
+    flags_storage.SetFlags(flags);
+}
+
 // Called from DoBrowserLaunch() or from
 // DoBrowserLaunchOnLocaleLoaded() depending on
 // if locale switch was needed.
 void LoginUtilsImpl::DoBrowserLaunchOnLocaleLoadedImpl(
     Profile* profile,
     LoginDisplayHost* login_host) {
   if (!UserManager::Get()->GetCurrentUserFlow()->ShouldLaunchBrowser()) {
     UserManager::Get()->GetCurrentUserFlow()->LaunchExtraSteps(profile);
     return;
   }
 
   CommandLine user_flags(CommandLine::NO_PROGRAM);
+  RemoveObsoleteFlags(profile->GetPrefs());
   about_flags::PrefServiceFlagsStorage flags_storage_(profile->GetPrefs());
   about_flags::ConvertFlagsToSwitches(&flags_storage_, &user_flags,
                                       about_flags::kAddSentinels);
   // Only restart if needed and if not going into managed mode.
   // Don't restart browser if it is not first profile in session.
   if (UserManager::Get()->GetLoggedInUsers().size() == 1 &&
       !UserManager::Get()->IsLoggedInAsLocallyManagedUser() &&
       !about_flags::AreSwitchesIdenticalToCurrentCommandLine(
           user_flags, *CommandLine::ForCurrentProcess())) {
     CommandLine::StringVector flags;
@@ skipping 628 matching lines @@
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(
       kAccountsPrefUsers, username, wildcard_match);
 }
 
 }  // namespace chromeos