Remove use of JSONReader::DeprecatedRead from google_apis/

Remove use of deprecated function DeprecatedRead from google_apis/ BUG=523194 Review URL: https://codereview.chromium.org/1322103003 Cr-Commit-Position: refs/heads/master@{#346871}
Denger-Network · Sep 2, 2015 · fc4b47b · fc4b47b
1 parent e1b4f7e
commit fc4b47b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/google_apis/drive/base_requests.cc b/google_apis/drive/base_requests.cc
@@ -193,8 +193,8 @@ namespace google_apis {
 scoped_ptr<base::Value> ParseJson(const std::string& json) {
   int error_code = -1;
   std::string error_message;
-  scoped_ptr<base::Value> value(base::JSONReader::DeprecatedReadAndReturnError(
-      json, base::JSON_PARSE_RFC, &error_code, &error_message));
+  scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError(
+      json, base::JSON_PARSE_RFC, &error_code, &error_message);
 
   if (!value.get()) {
     std::string trimmed_json;

diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc
@@ -1945,9 +1945,9 @@ TEST_F(DriveApiRequestsTest, PermissionsInsertRequest) {
             http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
 
-  scoped_ptr<base::Value> expected(base::JSONReader::DeprecatedRead(
+  scoped_ptr<base::Value> expected = base::JSONReader::Read(
       "{\"additionalRoles\":[\"commenter\"], \"role\":\"reader\", "
-      "\"type\":\"user\",\"value\":\"user@example.com\"}"));
+      "\"type\":\"user\",\"value\":\"user@example.com\"}");
   ASSERT_TRUE(expected);
 
   scoped_ptr<base::Value> result =
@@ -1980,11 +1980,11 @@ TEST_F(DriveApiRequestsTest, PermissionsInsertRequest) {
             http_request_.relative_url);
   EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
 
-  expected.reset(base::JSONReader::DeprecatedRead(
-      "{\"role\":\"writer\", \"type\":\"domain\",\"value\":\"example.com\"}"));
+  expected = base::JSONReader::Read(
+      "{\"role\":\"writer\", \"type\":\"domain\",\"value\":\"example.com\"}");
   ASSERT_TRUE(expected);
 
-  result.reset(base::JSONReader::DeprecatedRead(http_request_.content));
+  result = base::JSONReader::Read(http_request_.content);
   EXPECT_TRUE(http_request_.has_content);
   EXPECT_TRUE(base::Value::Equals(expected.get(), result.get()));
 }

diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -367,8 +367,8 @@ TEST_F(GaiaOAuthClientTest, GetUserInfo) {
   GaiaOAuthClient auth(GetRequestContext());
   auth.GetUserInfo("access_token", 1, &delegate);
 
-  scoped_ptr<base::Value> value(
-      base::JSONReader::DeprecatedRead(kDummyFullUserInfoResult));
+  scoped_ptr<base::Value> value =
+      base::JSONReader::Read(kDummyFullUserInfoResult);
   DCHECK(value);
   ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY));
   base::DictionaryValue* expected_result;