Add URL parameter so that /ListAccounts returns valid json.

chrome/browser/chromeos/login/oauth2_login_manager.cc

 // Copyright (c) 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/chromeos/login/oauth2_login_manager.h"
 
+#include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
@@ skipping 268 matching lines @@
              << " connection_error: " << connection_error;
   RecordSessionRestoreOutcome(SESSION_RESTORE_MERGE_SESSION_FAILED,
                               connection_error ?
                                   SESSION_RESTORE_CONNECTION_FAILED :
                                   SESSION_RESTORE_FAILED);
 }
 
 void OAuth2LoginManager::OnListAccountsSuccess(const std::string& data) {
   MergeVerificationOutcome outcome = POST_MERGE_SUCCESS;
   // Let's analyze which accounts we see logged in here:
-  std::vector<std::string> accounts;
+  std::vector<std::pair<std::string, bool> > accounts;
   gaia::ParseListAccountsData(data, &accounts);
   std::string user_email = gaia::CanonicalizeEmail(GetPrimaryAccountId());
   if (!accounts.empty()) {
     bool found = false;
     bool first = true;
-    for (std::vector<std::string>::const_iterator iter = accounts.begin();
+    for (std::vector<std::pair<std::string, bool> >::const_iterator iter =
+             accounts.begin();
          iter != accounts.end(); ++iter) {
-      if (gaia::CanonicalizeEmail(*iter) == user_email) {
+      if (gaia::CanonicalizeEmail(iter->first) == user_email) {
         found = true;
         break;
       }
 
       first = false;
     }
 
     if (!found)
       outcome = POST_MERGE_MISSING_PRIMARY_ACCOUNT;
     else if (!first)
@@ skipping 78 matching lines @@
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnSessionRestoreStateChanged(user_profile_, state_));
 }
 
 void OAuth2LoginManager::SetSessionRestoreStartForTesting(
     const base::Time& time) {
   session_restore_start_ = time;
 }
 
 }  // namespace chromeos