[Extensions] Update generated code to support movable additional properties

tools/json_schema_compiler/test/objects_unittest.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 <stddef.h>
 
 #include "base/json/json_writer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/json_schema_compiler/test/objects.h"
 #include "tools/json_schema_compiler/test/objects_movable.h"
+#include "tools/json_schema_compiler/test/objects_movable_json.h"
 
 using namespace test::api::objects;
 using namespace test::api::objects_movable;
+using namespace test::api::objects_movable_json;
 
 TEST(JsonSchemaCompilerObjectsTest, ObjectParamParamsCreate) {
   {
     scoped_ptr<base::ListValue> strings(new base::ListValue());
     strings->Append(new base::StringValue("one"));
     strings->Append(new base::StringValue("two"));
     scoped_ptr<base::DictionaryValue> info_value(new base::DictionaryValue());
     info_value->Set("strings", strings.release());
     info_value->Set("integer", new base::FundamentalValue(5));
     info_value->Set("boolean", new base::FundamentalValue(true));
@@ skipping 62 matching lines @@
     MovablePod pod;
     pod.foo = FOO_BAZ;
     pod.str = "str2";
     pod.num = 45;
     pod.b = false;
     pods.push_back(std::move(pod));
   }
   MovableParent parent;
   parent.pods = std::move(pods);
   parent.strs.push_back("pstr");
+  parent.blob.additional_properties.SetString("key", "val");
 
   MovableParent parent2(std::move(parent));
   ASSERT_EQ(2u, parent2.pods.size());
   EXPECT_EQ(FOO_BAR, parent2.pods[0].foo);
   EXPECT_EQ("str1", parent2.pods[0].str);
   EXPECT_EQ(42, parent2.pods[0].num);
   EXPECT_TRUE(parent2.pods[0].b);
   EXPECT_EQ(FOO_BAZ, parent2.pods[1].foo);
   EXPECT_EQ("str2", parent2.pods[1].str);
   EXPECT_EQ(45, parent2.pods[1].num);
   EXPECT_FALSE(parent2.pods[1].b);
   ASSERT_EQ(1u, parent2.strs.size());
   EXPECT_EQ("pstr", parent2.strs[0]);
+  std::string blob_string;
+  EXPECT_TRUE(
+      parent2.blob.additional_properties.GetString("key", &blob_string));
+  EXPECT_EQ("val", blob_string);
+
+  MovableWithAdditional with_additional;
+  with_additional.str = "str";
+  std::vector<std::string> vals1;
+  vals1.push_back("vals1a");
+  vals1.push_back("vals1b");
+  with_additional.additional_properties["key1"] = vals1;
+  std::vector<std::string> vals2;
+  vals2.push_back("vals2a");
+  vals2.push_back("vals2b");
+  with_additional.additional_properties["key2"] = vals2;
+
+  MovableWithAdditional with_additional2(std::move(with_additional));
+  EXPECT_EQ("str", with_additional2.str);
+  EXPECT_EQ(2u, with_additional2.additional_properties.size());
+  EXPECT_EQ(vals1, with_additional2.additional_properties["key1"]);
+  EXPECT_EQ(vals2, with_additional2.additional_properties["key2"]);
 }