[Extensions Bindings] Consider argument type more in signature parsing

extensions/renderer/bindings/argument_spec_unittest.cc

 // Copyright 2016 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 "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "extensions/renderer/bindings/api_binding_test_util.h"
 #include "extensions/renderer/bindings/api_invocation_errors.h"
 #include "extensions/renderer/bindings/api_type_reference_map.h"
 #include "extensions/renderer/bindings/argument_spec.h"
@@ skipping 465 matching lines @@
 }
 
 TEST_F(ArgumentSpecUnitTest, TypeChoicesTest) {
   using namespace api_errors;
   {
     const char kSimpleChoices[] =
         "{'choices': [{'type': 'string'}, {'type': 'integer'}]}";
     ArgumentSpec spec(*ValueFromString(kSimpleChoices));
     ExpectSuccess(spec, "'alpha'", "'alpha'");
     ExpectSuccess(spec, "42", "42");
-    ExpectFailure(spec, "true", InvalidChoice());
+    const char kChoicesType[] = "[string|integer]";
+    ExpectFailure(spec, "true", InvalidType(kChoicesType, kTypeBoolean));
   }
 
   {
     const char kComplexChoices[] =
         "{"
         "  'choices': ["
         "    {'type': 'array', 'items': {'type': 'string'}},"
         "    {'type': 'object', 'properties': {'prop1': {'type': 'string'}}}"
         "  ]"
         "}";
     ArgumentSpec spec(*ValueFromString(kComplexChoices));
     ExpectSuccess(spec, "['alpha']", "['alpha']");
     ExpectSuccess(spec, "['alpha', 'beta']", "['alpha','beta']");
     ExpectSuccess(spec, "({prop1: 'alpha'})", "{'prop1':'alpha'}");
+
+    const char kChoicesType[] = "[array|object]";
     ExpectFailure(spec, "({prop1: 1})", InvalidChoice());
-    ExpectFailure(spec, "'alpha'", InvalidChoice());
-    ExpectFailure(spec, "42", InvalidChoice());
+    ExpectFailure(spec, "'alpha'", InvalidType(kChoicesType, kTypeString));
+    ExpectFailure(spec, "42", InvalidType(kChoicesType, kTypeInteger));
   }
 }
 
 TEST_F(ArgumentSpecUnitTest, AdditionalPropertiesTest) {
   using namespace api_errors;
   {
     const char kOnlyAnyAdditionalProperties[] =
         "{"
         "  'type': 'object',"
         "  'additionalProperties': {'type': 'any'}"
@@ skipping 294 matching lines @@
     std::vector<std::unique_ptr<ArgumentSpec>> choices;
     choices.push_back(base::MakeUnique<ArgumentSpec>(ArgumentType::INTEGER));
     choices.push_back(base::MakeUnique<ArgumentSpec>(ArgumentType::STRING));
     ArgumentSpec choices_spec(ArgumentType::CHOICES);
     choices_spec.set_choices(std::move(choices));
     EXPECT_EQ("[integer|string]", choices_spec.GetTypeName());
   }
 }
 
 }  // namespace extensions