Remove use of JSONReader::DeprecatedRead from components/

components/webcrypto/test/test_helpers.cc

 // 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.
 
 #include "components/webcrypto/test/test_helpers.h"
 
 #include <algorithm>
 
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 183 matching lines @@
   if (!base::ReadFileToString(file_path, &file_contents)) {
     return ::testing::AssertionFailure()
            << "Couldn't read test file: " << file_path.value();
   }
 
   // Strip C++ style comments out of the "json" file, otherwise it cannot be
   // parsed.
   re2::RE2::GlobalReplace(&file_contents, re2::RE2("\\s*//.*"), "");
 
   // Parse the JSON to a dictionary.
-  value->reset(base::JSONReader::DeprecatedRead(file_contents));
+  *value = base::JSONReader::Read(file_contents);
   if (!value->get()) {
     return ::testing::AssertionFailure()
            << "Couldn't parse test file JSON: " << file_path.value();
   }
 
   return ::testing::AssertionSuccess();
 }
 
 ::testing::AssertionResult ReadJsonTestFileToList(
     const char* test_file_name,
@@ skipping 206 matching lines @@
                             blink::WebCryptoKey* key) {
   return ImportKey(blink::WebCryptoKeyFormatJwk,
                    CryptoData(MakeJsonVector(dict)), algorithm, extractable,
                    usages, key);
 }
 
 scoped_ptr<base::DictionaryValue> GetJwkDictionary(
     const std::vector<uint8_t>& json) {
   base::StringPiece json_string(
       reinterpret_cast<const char*>(vector_as_array(&json)), json.size());
-  base::Value* value = base::JSONReader::DeprecatedRead(json_string);
-  EXPECT_TRUE(value);
-  base::DictionaryValue* dict_value = NULL;
-  value->GetAsDictionary(&dict_value);
-  return scoped_ptr<base::DictionaryValue>(dict_value);
+  scoped_ptr<base::Value> value = base::JSONReader::Read(json_string);
+  EXPECT_TRUE(value.get());
+  EXPECT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY));
+
+  return scoped_ptr<base::DictionaryValue>(
+      static_cast<base::DictionaryValue*>(value.release()));
 }
 
 // Verifies the input dictionary contains the expected values. Exact matches are
 // required on the fields examined.
 ::testing::AssertionResult VerifyJwk(
     const scoped_ptr<base::DictionaryValue>& dict,
     const std::string& kty_expected,
     const std::string& alg_expected,
     blink::WebCryptoKeyUsageMask use_mask_expected) {
   // ---- kty
@@ skipping 241 matching lines @@
     return blink::WebCryptoNamedCurveP384;
   if (curve_str == "P-521")
     return blink::WebCryptoNamedCurveP521;
   else
     ADD_FAILURE() << "Unrecognized curve name: " << curve_str;
 
   return blink::WebCryptoNamedCurveP384;
 }
 
 }  // namespace webcrypto