Revert recent changes to base::Value

base/json/json_reader_unittest.cc

 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 204 matching lines @@
   root.reset(JSONReader().JsonToValue("\"not enough escape chars\\u123\"",
                                       false, false));
   ASSERT_FALSE(root.get());
   root.reset(JSONReader().JsonToValue("\"extra backslash at end of input\\\"",
                                       false, false));
   ASSERT_FALSE(root.get());
 
   // Basic array
   root.reset(JSONReader::Read("[true, false, null]", false));
   ASSERT_TRUE(root.get());
-  ListValue* list = root->AsList();
-  ASSERT_TRUE(list);
+  ASSERT_TRUE(root->IsType(Value::TYPE_LIST));
+  ListValue* list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(3U, list->GetSize());
 
   // Test with trailing comma.  Should be parsed the same as above.
   scoped_ptr<Value> root2;
   root2.reset(JSONReader::Read("[true, false, null, ]", true));
   EXPECT_TRUE(root->Equals(root2.get()));
 
   // Empty array
   root.reset(JSONReader::Read("[]", false));
   ASSERT_TRUE(root.get());
-  list = root->AsList();
-  ASSERT_TRUE(list);
+  ASSERT_TRUE(root->IsType(Value::TYPE_LIST));
+  list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(0U, list->GetSize());
 
   // Nested arrays
   root.reset(JSONReader::Read("[[true], [], [false, [], [null]], null]",
                               false));
   ASSERT_TRUE(root.get());
-  list = root->AsList();
-  ASSERT_TRUE(list);
+  ASSERT_TRUE(root->IsType(Value::TYPE_LIST));
+  list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(4U, list->GetSize());
 
   // Lots of trailing commas.
   root2.reset(JSONReader::Read("[[true], [], [false, [], [null, ]  , ], null,]",
                                true));
   EXPECT_TRUE(root->Equals(root2.get()));
 
   // Invalid, missing close brace.
   root.reset(JSONReader::Read("[[true], [], [false, [], [null]], null", false));
   ASSERT_FALSE(root.get());
 
   // Invalid, too many commas
   root.reset(JSONReader::Read("[true,, null]", false));
   ASSERT_FALSE(root.get());
   root.reset(JSONReader::Read("[true,, null]", true));
   ASSERT_FALSE(root.get());
 
   // Invalid, no commas
   root.reset(JSONReader::Read("[true null]", false));
   ASSERT_FALSE(root.get());
 
   // Invalid, trailing comma
   root.reset(JSONReader::Read("[true,]", false));
   ASSERT_FALSE(root.get());
 
   // Valid if we set |allow_trailing_comma| to true.
   root.reset(JSONReader::Read("[true,]", true));
   ASSERT_TRUE(root.get());
-  list = root->AsList();
-  ASSERT_TRUE(list);
+  ASSERT_TRUE(root->IsType(Value::TYPE_LIST));
+  list = static_cast<ListValue*>(root.get());
   EXPECT_EQ(1U, list->GetSize());
   Value* tmp_value = NULL;
   ASSERT_TRUE(list->Get(0, &tmp_value));
   EXPECT_TRUE(tmp_value->IsType(Value::TYPE_BOOLEAN));
   bool bool_value = false;
   ASSERT_TRUE(tmp_value->GetAsBoolean(&bool_value));
   EXPECT_TRUE(bool_value);
 
   // Don't allow empty elements, even if |allow_trailing_comma| is
   // true.
@@ skipping 141 matching lines @@
 
   // A few thousand adjacent lists is fine.
   std::string not_evil("[");
   not_evil.reserve(15010);
   for (int i = 0; i < 5000; ++i) {
     not_evil.append("[],");
   }
   not_evil.append("[]]");
   root.reset(JSONReader::Read(not_evil, false));
   ASSERT_TRUE(root.get());
-  list = root->AsList();
-  ASSERT_TRUE(list);
+  ASSERT_TRUE(root->IsType(Value::TYPE_LIST));
+  list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(5001U, list->GetSize());
 
   // Test utf8 encoded input
   root.reset(JSONReader().JsonToValue("\"\xe7\xbd\x91\xe9\xa1\xb5\"",
                                       false, false));
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_STRING));
   str_val.clear();
   ASSERT_TRUE(root->GetAsString(&str_val));
   ASSERT_EQ(L"\x7f51\x9875", UTF8ToWide(str_val));
@@ skipping 107 matching lines @@
 
   root.reset(JSONReader::ReadAndReturnError("[\"xxx\\q\"]", false,
                                             &error_code, &error_message));
   EXPECT_FALSE(root.get());
   EXPECT_EQ(JSONReader::FormatErrorMessage(1, 7, JSONReader::kInvalidEscape),
             error_message);
   EXPECT_EQ(JSONReader::JSON_INVALID_ESCAPE, error_code);
 }
 
 }  // namespace base