Add URL parameter so that /ListAccounts returns valid json.

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 57 matching lines @@
 }
 
 bool IsGaiaSignonRealm(const GURL& url) {
   if (!url.SchemeIsSecure())
     return false;
 
   return url == GaiaUrls::GetInstance()->gaia_url();
 }
 
 
-bool ParseListAccountsData(const std::string& data,
-                           std::vector<std::string>* accounts) {
+bool ParseListAccountsData(
+    const std::string& data,
+    std::vector<std::pair<std::string, bool> >* accounts) {
   accounts->clear();
 
   // Parse returned data and make sure we have data.
   scoped_ptr<base::Value> value(base::JSONReader::Read(data));
   if (!value)
     return false;
 
   base::ListValue* list;
   if (!value->GetAsList(&list) || list->GetSize() < 2)
     return false;
 
   // Get list of account info.
   base::ListValue* account_list;
   if (!list->GetList(1, &account_list) || accounts == NULL)
     return false;
 
   // Build a vector of accounts from the cookie.  Order is important: the first
   // account in the list is the primary account.
   for (size_t i = 0; i < account_list->GetSize(); ++i) {
     base::ListValue* account;
     if (account_list->GetList(i, &account) && account != NULL) {
       std::string email;
       // Canonicalize the email since ListAccounts returns "display email".
-      if (account->GetString(3, &email) && !email.empty())
-        accounts->push_back(CanonicalizeEmail(email));
+      if (account->GetString(3, &email) && !email.empty()) {
+        // New version if ListAccounts indicates whether the email's session
+        // is still valid or not.  If this value is present and false, assume
+        // its invalid.  Otherwise assume it's valid to remain compatible with
+        // old version.
+        int is_email_valid = 1;
+        if (!account->GetInteger(9, &is_email_valid))
+          is_email_valid = 1;
+
+        accounts->push_back(
+            std::make_pair(CanonicalizeEmail(email), is_email_valid != 0));
+      }
     }
   }
 
   return true;
 }
 
 }  // namespace gaia