content/shell/shell_javascript_dialog_creator.cc - Issue 10941011: Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests

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: content/shell/shell_javascript_dialog_creator.cc

Issue 10941011: Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updates Created 8 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

« content/browser/worker_host/test/worker_browsertest.cc ('K') | « content/shell/shell_browser_main.cc ('k') | content/shell/webkit_test_runner.js » ('j') | content/test/layout_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/shell_javascript_dialog_creator.cc

diff --git a/content/shell/shell_javascript_dialog_creator.cc b/content/shell/shell_javascript_dialog_creator.cc

index 43d26ef7f73568d1089e1e6fd23e40593a8fd069..00342a46ddc1c2bbf2628b5284cc99898d876e1e 100644

--- a/content/shell/shell_javascript_dialog_creator.cc

+++ b/content/shell/shell_javascript_dialog_creator.cc

@@ -32,13 +32,13 @@ void ShellJavaScriptDialogCreator::RunJavaScriptDialog(

const DialogClosedCallback& callback,

bool* did_suppress_message) {

if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {

- WebKitTestResultPrinter& printer = WebKitTestController::Get()->printer();

+ WebKitTestResultPrinter* printer = WebKitTestController::Get()->printer();

if (javascript_message_type == JAVASCRIPT_MESSAGE_TYPE_ALERT) {

- printer.AddMessage(std::string("ALERT: ") + UTF16ToUTF8(message_text));

+ printer->AddMessage(std::string("ALERT: ") + UTF16ToUTF8(message_text));

} else if (javascript_message_type == JAVASCRIPT_MESSAGE_TYPE_CONFIRM) {

- printer.AddMessage(std::string("CONFIRM: ") + UTF16ToUTF8(message_text));

+ printer->AddMessage(std::string("CONFIRM: ") + UTF16ToUTF8(message_text));

} else { // JAVASCRIPT_MESSAGE_TYPE_PROMPT

- printer.AddMessage(std::string("PROMPT: ") + UTF16ToUTF8(message_text) +

+ printer->AddMessage(std::string("PROMPT: ") + UTF16ToUTF8(message_text) +

"default text: " + UTF16ToUTF8(default_prompt_text));

}

callback.Run(true, string16());

@@ -86,8 +86,8 @@ void ShellJavaScriptDialogCreator::RunBeforeUnloadDialog(

bool is_reload,

const DialogClosedCallback& callback) {

if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {

- WebKitTestResultPrinter& printer = WebKitTestController::Get()->printer();

- printer.AddMessage(

+ WebKitTestResultPrinter* printer = WebKitTestController::Get()->printer();

+ printer->AddMessage(

std::string("CONFIRM NAVIGATION: ") + UTF16ToUTF8(message_text));

WebKitTestController* controller = WebKitTestController::Get();

callback.Run(