diff options
| author | olli.raula <olli.raula@intel.com> | 2015-09-02 01:46:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-02 08:47:06 +0000 |
| commit | fc4b47b78523eb168411437944d3eefcb17b7039 (patch) | |
| tree | 6a487aa22d4989a8529baa8e36cad825af2d2337 /google_apis | |
| parent | e1b4f7e8d4b25ffa81c040a2b65c01fcfdf10240 (diff) | |
| download | chromium_src-fc4b47b78523eb168411437944d3eefcb17b7039.zip chromium_src-fc4b47b78523eb168411437944d3eefcb17b7039.tar.gz chromium_src-fc4b47b78523eb168411437944d3eefcb17b7039.tar.bz2 | |
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}
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/drive/base_requests.cc | 4 | ||||
| -rw-r--r-- | google_apis/drive/drive_api_requests_unittest.cc | 10 | ||||
| -rw-r--r-- | google_apis/gaia/gaia_oauth_client_unittest.cc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/google_apis/drive/base_requests.cc b/google_apis/drive/base_requests.cc index e526012..18846cb 100644 --- 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 index 5859b7c..358715e 100644 --- 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 index ee9f17a..b032b81 100644 --- 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; |