Use scoped_ptrs in JSONReader::Read functions.

There are many callers, so all could not be updated at once. The old version is renamed to JSONReader::DeprecatedRead, and a new version of JSONReader::Read that returns scoped_ptr takes its place.

Much of this patch was generated with sed. Some callsites of the form

  scoped_ptr<Value> value(Read());

have been updated to

  scoped_ptr<Value> value = Read();

but most Read() calls are simply converted to DeprecatedRead. Actually updating them is a TODO.

BUG=none

Review URL: https://codereview.chromium.org/1136643005

Cr-Commit-Position: refs/heads/master@{#331120}

1 files changed, 6 insertions, 12 deletions

diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc
index 7737e71..b232f6e 100644
--- a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc
+++ b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc
@@ -31,10 +31,8 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, ApplyPolicySettings) {
   EXPECT_FALSE(store_->GetValue(bookmarks::prefs::kManagedBookmarks, NULL));
 
   PolicyMap policy;
-  policy.Set(key::kManagedBookmarks,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
-             base::JSONReader::Read(
+  policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+             base::JSONReader::DeprecatedRead(
                  "["
                  "  {"
                  "    \"name\": \"Google\","
@@ -129,10 +127,8 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, WrongPolicyType) {
 #if defined(ENABLE_EXTENSIONS)
 TEST_F(ManagedBookmarksPolicyHandlerTest, UnknownKeys) {
   PolicyMap policy;
-  policy.Set(key::kManagedBookmarks,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
-             base::JSONReader::Read(
+  policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+             base::JSONReader::DeprecatedRead(
                  "["
                  "  {"
                  "    \"name\": \"Google\","
@@ -160,10 +156,8 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, UnknownKeys) {
 #if defined(ENABLE_EXTENSIONS)
 TEST_F(ManagedBookmarksPolicyHandlerTest, BadBookmark) {
   PolicyMap policy;
-  policy.Set(key::kManagedBookmarks,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
-             base::JSONReader::Read(
+  policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+             base::JSONReader::DeprecatedRead(
                  "["
                  "  {"
                  "    \"name\": \"Empty\","