Refactor the code that creates the list of secondary accounts

chrome/browser/profiles/profiles_state.cc

 // Copyright 2013 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/profiles/profiles_state.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/signin/profile_oauth2_token_service.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
@@ skipping 69 matching lines @@
 
     // Changing the profile name can invalidate the profile index.
     profile_index = cache.GetIndexOfProfileWithPath(profile_file_path);
     if (profile_index == std::string::npos)
       return;
 
     cache.SetIsUsingGAIANameOfProfileAtIndex(profile_index, false);
   }
 }
 
+std::vector<std::string> GetSecondaryAccountsForProfile(
+    Profile* profile, const std::string& primary_account) {
+  std::vector<std::string> accounts =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->GetAccounts();
+
+  // The vector returned by ProfileOAuth2TokenService::GetAccounts() contains
+  // the primary account too, so we need to remove it from the list.
+  std::vector<std::string>::iterator primary_index =
+      std::find_if(accounts.begin(), accounts.end(),
+                   std::bind1st(std::equal_to<std::string>(), primary_account));
+  DCHECK(primary_index != accounts.end());
+  accounts.erase(primary_index);

[rpetterson, 2014/01/08 18:12:33]

You could do it one go with:
accounts.erase(std::remove_if(accounts.begin(),
                              accounts.end(),
                              std::bind1st(std::equal_to<std::string>(),
primary_account)),
               accounts.end());

Unless you need to verify that the primary account was previously in the list,
in which case your version does that with the DCHECK.

[noms (inactive), 2014/01/08 19:13:21]

The original code also explicitly DCHECK'ed that the primary account was in the
list, as if it isn't, something has gone very, very bad, and the TokenService is
out of sync with the SigninManager (which knows about the primary account). 

 On 2014/01/08 18:12:33, rpetterson wrote:

+
+  return accounts;
+}
+
 }  // namespace profiles