[Extensions Binding] Update ArgumentSpec to support dictionary enums

extensions/renderer/argument_spec.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 "extensions/renderer/argument_spec.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "content/public/child/v8_value_converter.h"
 #include "gin/converter.h"
@@ skipping 75 matching lines @@
   } else if (type_ == ArgumentType::STRING) {
     // Technically, there's no reason enums couldn't be other objects (e.g.
     // numbers), but right now they seem to be exclusively strings. We could
     // always update this if need be.
     const base::ListValue* enums = nullptr;
     if (dict->GetList("enum", &enums)) {
       size_t size = enums->GetSize();
       CHECK_GT(size, 0u);
       for (size_t i = 0; i < size; ++i) {
         std::string enum_value;
-        CHECK(enums->GetString(i, &enum_value));
+        // Enum entries come in two versions: a list of possible strings, and
+        // a dictionary with a field 'name'.
+        if (!enums->GetString(i, &enum_value)) {
+          const base::DictionaryValue* enum_value_dictionary = nullptr;
+          CHECK(enums->GetDictionary(i, &enum_value_dictionary));
+          CHECK(enum_value_dictionary->GetString("name", &enum_value));
+        }
         enum_values_.insert(std::move(enum_value));
       }
     }
   }
 }
 
 ArgumentSpec::~ArgumentSpec() {}
 
 std::unique_ptr<base::Value> ArgumentSpec::ConvertArgument(
     v8::Local<v8::Context> context,
@@ skipping 151 matching lines @@
   std::unique_ptr<content::V8ValueConverter> converter(
       content::V8ValueConverter::create());
   std::unique_ptr<base::Value> converted(
       converter->FromV8Value(value, context));
   if (!converted)
     *error = "Could not convert to 'any'.";
   return converted;
 }
 
 }  // namespace extensions