Prefer to use the AccountID to the Email from ListAccounts.

google_apis/gaia/gaia_auth_util.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 "google_apis/gaia/gaia_auth_util.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 31 matching lines @@
 }
 
 }  // namespace
 
 
 ListedAccount::ListedAccount() {}
 
 ListedAccount::~ListedAccount() {}
 
 bool ListedAccount::operator==(const ListedAccount& other) const {
-  return email == other.email &&
-         gaia_id == other.gaia_id &&
-         valid == other.valid &&
-         raw_email == other.raw_email;
+  // Only use ids for comparison if they've been computed by some caller, since
+  // this class does not assign the id.
+  if (!id.empty() && !other.id.empty()) {
+    return id == other.id;
+  } else {
+    return email == other.email &&
+           gaia_id == other.gaia_id &&
+           valid == other.valid &&
+           raw_email == other.raw_email;
+  }

[Roger Tawa OOO till Jul 10th, 2015/06/09 19:16:52]

Maybe DHCECK that either both |id|s are set or they are not?

[Mike Lerman, 2015/06/09 19:29:20]

Why? It could very well be that one ListedAccount object has been processes by
the CookieManagerService and the other object has not; I don't think that's an
illegal situation.

[Roger Tawa OOO till Jul 10th, 2015/06/09 19:33:25]

OK, makes sense.  I was sure if there was a case where that would happen.

 }
 
 std::string CanonicalizeEmail(const std::string& email_address) {
   // CanonicalizeEmail() is called to process email strings that are eventually
   // shown to the user, and may also be used in persisting email strings.  To
   // avoid breaking this existing behavior, this function will not try to
   // change googlemail to gmail.
   return CanonicalizeEmailImpl(email_address, false);
 }
 
@@ skipping 84 matching lines @@
           accounts->push_back(listed_account);
         }
       }
     }
   }
 
   return true;
 }
 
 }  // namespace gaia