chrome/test/ui_test_utils.cc - Issue 316016: Move the json-related files into a separate json directory. This hopefully al...

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/ui_test_utils.cc

Issue 316016: Move the json-related files into a separate json directory. This hopefully al... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 2 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

Index: chrome/test/ui_test_utils.cc

===================================================================

--- chrome/test/ui_test_utils.cc (revision 29830)

+++ chrome/test/ui_test_utils.cc (working copy)

@@ -6,7 +6,7 @@

#include <vector>

-#include "base/json_reader.h"

+#include "base/json/json_reader.h"

#include "base/message_loop.h"

#include "base/path_service.h"

#include "base/process_util.h"

@@ -397,7 +397,7 @@

json.insert(0, "[");

json.append("]");

- scoped_ptr<Value> root_val(JSONReader::Read(json, true));

+ scoped_ptr<Value> root_val(base::JSONReader::Read(json, true));

if (!root_val->IsType(Value::TYPE_LIST))

return NULL;

« no previous file with comments | « chrome/renderer/extensions/extension_process_bindings.cc ('k') | ipc/ipc_message_utils.cc » ('j') | no next file with comments »