Add scoped_ptr-safe base::Value to Dictionary/List conversion functions.

extensions/browser/api_test_utils.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 "extensions/browser/api_test_utils.h"
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::ExtensionFunctionDispatcher;
 
 namespace {
 
 scoped_ptr<base::Value> ParseJSON(const std::string& data) {
   return base::JSONReader::Read(data);
 }
 
 scoped_ptr<base::ListValue> ParseList(const std::string& data) {
-  scoped_ptr<base::Value> result = ParseJSON(data);
-  scoped_ptr<base::ListValue> list_result;
-  if (result->GetAsList(nullptr))
-    list_result.reset(static_cast<base::ListValue*>(result.release()));
-  return list_result;
+  return base::ListValue::From(ParseJSON(data));
 }
 
 // This helps us be able to wait until an UIThreadExtensionFunction calls
 // SendResponse.
 class SendResponseDelegate
     : public UIThreadExtensionFunction::DelegateForTests {
  public:
   SendResponseDelegate() : should_post_quit_(false) {}
 
   virtual ~SendResponseDelegate() {}
@@ skipping 26 matching lines @@
   bool should_post_quit_;
 };
 
 }  // namespace
 
 namespace extensions {
 
 namespace api_test_utils {
 
 scoped_ptr<base::DictionaryValue> ParseDictionary(const std::string& data) {
-  scoped_ptr<base::Value> result = ParseJSON(data);
-  scoped_ptr<base::DictionaryValue> dict_result;
-  if (result->GetAsDictionary(nullptr))
-    dict_result.reset(static_cast<base::DictionaryValue*>(result.release()));
-  return dict_result;
+  return base::DictionaryValue::From(ParseJSON(data));
 }
 
 bool GetBoolean(const base::DictionaryValue* val, const std::string& key) {
   bool result = false;
   if (!val->GetBoolean(key, &result))
     ADD_FAILURE() << key << " does not exist or is not a boolean.";
   return result;
 }
 
 int GetInteger(const base::DictionaryValue* val, const std::string& key) {
@@ skipping 150 matching lines @@
     response_delegate.set_should_post_quit(true);
     content::RunMessageLoop();
   }
 
   EXPECT_TRUE(response_delegate.HasResponse());
   return response_delegate.GetResponse();
 }
 
 }  // namespace api_test_utils
 }  // namespace extensions