Overhaul JSON Schema Compiler to support a number of features required to

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_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 "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
 
 #include <set>
 
 #include "base/message_loop.h"
 #include "base/test/values_test_util.h"
@@ skipping 73 matching lines @@
   EXPECT_FALSE(result->IsFulfilled(
       WebRequestRule::RequestData(&wrong_resource_type, ON_BEFORE_REQUEST)));
 }
 
 TEST(WebRequestConditionTest, CreateConditionSet) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
   WebRequestConditionSet::AnyVector conditions;
-
-  linked_ptr<json_schema_compiler::any::Any> condition1 = make_linked_ptr(
-      new json_schema_compiler::any::Any);
-  condition1->Init(*base::test::ParseJson(
+  conditions.push_back(linked_ptr<base::Value>(base::test::ParseJson(
       "{ \n"
       "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
       "  \"url\": { \n"
       "    \"hostSuffix\": \"example.com\", \n"
       "    \"schemes\": [\"http\"], \n"
       "  }, \n"
-      "}"));
-  conditions.push_back(condition1);
-
-  linked_ptr<json_schema_compiler::any::Any> condition2 = make_linked_ptr(
-      new json_schema_compiler::any::Any);
-  condition2->Init(*base::test::ParseJson(
+      "}").release()));
+  conditions.push_back(linked_ptr<base::Value>(base::test::ParseJson(
       "{ \n"
       "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
       "  \"url\": { \n"
       "    \"hostSuffix\": \"example.com\", \n"
       "    \"hostPrefix\": \"www\", \n"
       "    \"schemes\": [\"https\"], \n"
       "  }, \n"
-      "}"));
-  conditions.push_back(condition2);
+      "}").release()));
 
   // Test insertion
   std::string error;
   scoped_ptr<WebRequestConditionSet> result =
       WebRequestConditionSet::Create(matcher.condition_factory(),
                                      conditions, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
   EXPECT_EQ(2u, result->conditions().size());
 
@@ skipping 44 matching lines @@
       ++number_matches;
   }
   EXPECT_EQ(0, number_matches);
 }
 
 TEST(WebRequestConditionTest, TestPortFilter) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
-  linked_ptr<json_schema_compiler::any::Any> any_condition =
-      make_linked_ptr(new json_schema_compiler::any::Any);
-  any_condition->Init(*base::test::ParseJson(
+  WebRequestConditionSet::AnyVector conditions;
+  conditions.push_back(linked_ptr<base::Value>(base::test::ParseJson(
       "{ \n"
       "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
       "  \"url\": { \n"
       "    \"ports\": [80, [1000, 1010]], \n"  // Allow 80;1000-1010.
       "    \"hostSuffix\": \"example.com\", \n"
       "  }, \n"
-      "}"));
-  WebRequestConditionSet::AnyVector conditions;
-  conditions.push_back(any_condition);
+      "}").release()));
 
   // Test insertion
   std::string error;
   scoped_ptr<WebRequestConditionSet> result =
       WebRequestConditionSet::Create(matcher.condition_factory(),
                                      conditions, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
   EXPECT_EQ(1u, result->conditions().size());
 
@@ skipping 53 matching lines @@
           // filters.
           "  \"requestHeaders\": [{}], \n"
           "  \"responseHeaders\": [{}], \n"
           "}"),
       &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 }
 
 }  // namespace extensions