identity.getAccounts should return one array instead of multiple AccountInfos

chrome/browser/extensions/api/identity/identity_apitest.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 <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 361 matching lines @@
   testing::AssertionResult ExpectGetAccounts(
       const std::vector<std::string>& accounts) {
     scoped_refptr<IdentityGetAccountsFunction> func(
         new IdentityGetAccountsFunction);
     func->set_extension(utils::CreateEmptyExtension(kExtensionId).get());
     if (!utils::RunFunction(
             func.get(), std::string("[]"), browser(), utils::NONE)) {
       return GenerateFailureResult(accounts, NULL)
              << "getAccounts did not return a result.";
     }
-    const base::ListValue* results = func->GetResultList();
-    if (!results || (results->GetSize() != accounts.size()))
-      return GenerateFailureResult(accounts, results);
+    const base::ListValue* callback_arguments = func->GetResultList();
+    if (!callback_arguments)
+      return GenerateFailureResult(accounts, NULL) << "NULL result";
+
+    if (callback_arguments->GetSize() != 1) {
+      return GenerateFailureResult(accounts, NULL)
+             << "Expected 1 argument but got " << callback_arguments->GetSize();
+    }
+
+    const base::ListValue* results;
+    if (!callback_arguments->GetList(0, &results))
+      GenerateFailureResult(accounts, NULL) << "Result was not an array";
 
     std::set<std::string> result_ids;
     for (base::ListValue::const_iterator it = results->begin();
          it != results->end();
          ++it) {
       scoped_ptr<api::identity::AccountInfo> info =
           api::identity::AccountInfo::FromValue(**it);
       if (info.get())
         result_ids.insert(info->id);
       else
@@ skipping 1069 matching lines @@
   EXPECT_EQ(std::string("https://abcdefghij.chromiumapp.org/callback#test"),
             url);
 }
 
 }  // namespace extensions
 
 // Tests the chrome.identity API implemented by custom JS bindings .
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeIdentityJsBindings) {
   ASSERT_TRUE(RunExtensionTest("identity/js_bindings")) << message_;
 }