diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
| commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
| tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/third_party/libaddressinput | |
| parent | e733310db58160074f574c429d48f8308c0afe17 (diff) | |
| download | qtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz | |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/third_party/libaddressinput')
| -rw-r--r-- | chromium/third_party/libaddressinput/chromium/json.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/libaddressinput/chromium/json.cc b/chromium/third_party/libaddressinput/chromium/json.cc index 887d55df8f9..fbfcb3a9d07 100644 --- a/chromium/third_party/libaddressinput/chromium/json.cc +++ b/chromium/third_party/libaddressinput/chromium/json.cc @@ -29,7 +29,7 @@ namespace { // of the standalone library use char* rather than std::string. ::std::unique_ptr<const base::Value> parsed( base::JSONReader::Read(json.c_str())); - *parser_error = !parsed || !parsed->IsType(base::Value::TYPE_DICTIONARY); + *parser_error = !parsed || !parsed->IsType(base::Value::Type::DICTIONARY); if (*parser_error) result.reset(new base::DictionaryValue); @@ -57,7 +57,7 @@ class Json::JsonImpl { if (sub_dicts_.empty()) { for (base::DictionaryValue::Iterator it(dict_); !it.IsAtEnd(); it.Advance()) { - if (it.value().IsType(base::Value::TYPE_DICTIONARY)) { + if (it.value().IsType(base::Value::Type::DICTIONARY)) { const base::DictionaryValue* sub_dict = NULL; it.value().GetAsDictionary(&sub_dict); owned_sub_dicts_.push_back( |