chrome/test/chromedriver/chrome_launcher.cc - Issue 1310173010: Remove use of JSONReader::DeprecatedRead from chrome/test

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/chromedriver/chrome_launcher.cc

Issue 1310173010: Remove use of JSONReader::DeprecatedRead from chrome/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix error Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/test/chromedriver/chrome/dom_tracker_unittest.cc ('K') | « chrome/test/chromedriver/chrome/frame_tracker_unittest.cc ('k') | chrome/test/chromedriver/chrome_launcher_unittest.cc » ('j') | chrome/test/remoting/remote_desktop_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/chromedriver/chrome_launcher.cc

diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc

index be302dc2a2ac5e7f074d27179092456b1c1b7a14..0f6e4401e6c0bb2622a31ff58e8577143c758e9d 100644

--- a/chrome/test/chromedriver/chrome_launcher.cc

+++ b/chrome/test/chromedriver/chrome_launcher.cc

@@ -775,9 +775,8 @@ Status WritePrefsFile(

const base::FilePath& path) {

int code;

std::string error_msg;

- scoped_ptr<base::Value> template_value(

- base::JSONReader::DeprecatedReadAndReturnError(template_string, 0, &code,

- &error_msg));

+ scoped_ptr<base::Value> template_value = base::JSONReader::ReadAndReturnError(

+ template_string, 0, &code, &error_msg);

base::DictionaryValue* prefs;

if (!template_value || !template_value->GetAsDictionary(&prefs)) {

return Status(kUnknownError,