Support having javascript return dictionaries.

ios/web/web_state/ui/web_view_js_utils_unittest.mm

 // Copyright 2014 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.
 
 #import "ios/web/web_state/ui/web_view_js_utils.h"
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/test/ios/wait_util.h"
 #include "base/values.h"
@@ skipping 82 matching lines @@
 }
 
 // Tests that ValueResultFromWKResult converts null to Value::TYPE_NULL.
 TEST_F(WebViewJsUtilsTest, ValueResultFromNullWKResult) {
   std::unique_ptr<base::Value> value(
       web::ValueResultFromWKResult([NSNull null]));
   EXPECT_TRUE(value);
   EXPECT_EQ(base::Value::TYPE_NULL, value->GetType());
 }
 
+// Tests that ValueResultFromWKResult converts NSDictionaries to properly
+// initialized base::DictionaryValue.
+TEST_F(WebViewJsUtilsTest, ValueResultFromDictionaryWKResult) {
+  NSDictionary* dictionnary =

[marq (ping after 24h), 2016/08/23 12:28:26]

Spelling: "dictionary".

[jif, 2016/08/23 12:59:12]

Done.

+      @{ @"Key1" : @"Value1",
+         @"Key2" : @{@"Key3" : @42} };
+
+  std::unique_ptr<base::Value> value(web::ValueResultFromWKResult(dictionnary));
+  base::DictionaryValue* dictionary = nullptr;
+  value->GetAsDictionary(&dictionary);
+  EXPECT_NE(nullptr, dictionary);
+
+  std::string value1;
+  dictionary->GetString("Key1", &value1);
+  EXPECT_EQ("Value1", value1);
+
+  base::DictionaryValue const* innerDictionary = nullptr;
+  dictionary->GetDictionary("Key2", &innerDictionary);
+  EXPECT_NE(nullptr, innerDictionary);
+
+  double value3;
+  innerDictionary->GetDouble("Key3", &value3);
+  EXPECT_EQ(42, value3);
+}
+
 // Tests that a script with undefined result correctly evaluates to string.
 TEST_F(WebViewJsUtilsTest, UndefinedEvaluation) {
   EXPECT_NSEQ(@"", EvaluateJavaScript(@"{}"));
 }
 
 // Tests that a script with string result correctly evaluates to string.
 TEST_F(WebViewJsUtilsTest, StringEvaluation) {
   EXPECT_NSEQ(@"test", EvaluateJavaScript(@"'test'"));
 }
 
@@ skipping 10 matching lines @@
   EXPECT_NSEQ(@"true", EvaluateJavaScript(@"true"));
   EXPECT_NSEQ(@"false", EvaluateJavaScript(@"false"));
 }
 
 // Tests that a script with null result correctly evaluates to empty string.
 TEST_F(WebViewJsUtilsTest, NullEvaluation) {
   EXPECT_NSEQ(@"", EvaluateJavaScript(@"null"));
 }
 
 }  // namespace web