Index: content/shell/renderer/test_runner/web_test_proxy.cc |
diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc |
index 983c864de63e11ac90444219d6c8c377dd1f7606..0f37ce29670dfdf7c80ee12a37ed88e5bf463055 100644 |
--- a/content/shell/renderer/test_runner/web_test_proxy.cc |
+++ b/content/shell/renderer/test_runner/web_test_proxy.cc |
@@ -14,7 +14,6 @@ |
#include "base/strings/stringprintf.h" |
#include "base/strings/utf_string_conversions.h" |
#include "content/public/common/content_switches.h" |
-#include "content/shell/renderer/test_runner/WebTestDelegate.h" |
#include "content/shell/renderer/test_runner/WebTestInterfaces.h" |
#include "content/shell/renderer/test_runner/accessibility_controller.h" |
#include "content/shell/renderer/test_runner/event_sender.h" |
@@ -28,6 +27,7 @@ |
#include "content/shell/renderer/test_runner/test_interfaces.h" |
#include "content/shell/renderer/test_runner/test_plugin.h" |
#include "content/shell/renderer/test_runner/test_runner.h" |
+#include "content/shell/renderer/test_runner/web_test_delegate.h" |
#include "content/shell/renderer/test_runner/web_test_runner.h" |
// FIXME: Including platform_canvas.h here is a layering violation. |
#include "skia/ext/platform_canvas.h" |
@@ -74,17 +74,17 @@ void PrintFrameDescription(WebTestDelegate* delegate, blink::WebFrame* frame) { |
std::string name8 = frame->uniqueName().utf8(); |
if (frame == frame->view()->mainFrame()) { |
if (!name8.length()) { |
- delegate->printMessage("main frame"); |
+ delegate->PrintMessage("main frame"); |
return; |
} |
- delegate->printMessage(std::string("main frame \"") + name8 + "\""); |
+ delegate->PrintMessage(std::string("main frame \"") + name8 + "\""); |
return; |
} |
if (!name8.length()) { |
- delegate->printMessage("frame (anonymous)"); |
+ delegate->PrintMessage("frame (anonymous)"); |
return; |
} |
- delegate->printMessage(std::string("frame \"") + name8 + "\""); |
+ delegate->PrintMessage(std::string("frame \"") + name8 + "\""); |
} |
void PrintFrameuserGestureStatus(WebTestDelegate* delegate, |
@@ -92,7 +92,7 @@ void PrintFrameuserGestureStatus(WebTestDelegate* delegate, |
const char* msg) { |
bool is_user_gesture = |
blink::WebUserGestureIndicator::isProcessingUserGesture(); |
- delegate->printMessage(std::string("Frame with user gesture \"") + |
+ delegate->PrintMessage(std::string("Frame with user gesture \"") + |
(is_user_gesture ? "true" : "false") + "\"" + msg); |
} |
@@ -116,10 +116,10 @@ std::string DescriptionSuitableForTestResult(const std::string& url) { |
void PrintResponseDescription(WebTestDelegate* delegate, |
const blink::WebURLResponse& response) { |
if (response.isNull()) { |
- delegate->printMessage("(null)"); |
+ delegate->PrintMessage("(null)"); |
return; |
} |
- delegate->printMessage(base::StringPrintf( |
+ delegate->PrintMessage(base::StringPrintf( |
"<NSURLResponse %s, http status code %d>", |
DescriptionSuitableForTestResult(response.url().spec()).c_str(), |
response.httpStatusCode())); |
@@ -311,7 +311,7 @@ std::string DumpAllBackForwardLists(TestInterfaces* interfaces, |
const std::vector<WebTestProxyBase*>& window_list = |
interfaces->GetWindowList(); |
for (size_t i = 0; i < window_list.size(); ++i) |
- result.append(delegate->dumpHistoryForWindow(window_list.at(i))); |
+ result.append(delegate->DumpHistoryForWindow(window_list.at(i))); |
return result; |
} |
} |
@@ -379,7 +379,7 @@ blink::WebColorChooser* WebTestProxyBase::CreateColorChooser( |
bool WebTestProxyBase::RunFileChooser( |
const blink::WebFileChooserParams& params, |
blink::WebFileChooserCompletion* completion) { |
- delegate_->printMessage("Mock: Opening a file chooser.\n"); |
+ delegate_->PrintMessage("Mock: Opening a file chooser.\n"); |
// FIXME: Add ability to set file names to a file upload control. |
return false; |
} |
@@ -387,11 +387,9 @@ bool WebTestProxyBase::RunFileChooser( |
void WebTestProxyBase::ShowValidationMessage( |
const base::string16& message, |
const base::string16& sub_message) { |
- delegate_->printMessage( |
- "ValidationMessageClient: main-message=" + |
- base::UTF16ToUTF8(message) + |
- " sub-message=" + |
- base::UTF16ToUTF8(sub_message) + "\n"); |
+ delegate_->PrintMessage("ValidationMessageClient: main-message=" + |
+ base::UTF16ToUTF8(message) + " sub-message=" + |
+ base::UTF16ToUTF8(sub_message) + "\n"); |
} |
std::string WebTestProxyBase::CaptureTree(bool debug_render_tree) { |
@@ -615,7 +613,7 @@ void WebTestProxyBase::ScheduleAnimation() { |
if (!animate_scheduled_) { |
animate_scheduled_ = true; |
- delegate_->postDelayedTask( |
+ delegate_->PostDelayedTask( |
new HostMethodTask(this, &WebTestProxyBase::AnimateNow), 1); |
} |
} |
@@ -750,7 +748,7 @@ void WebTestProxyBase::PostAccessibilityEvent(const blink::WebAXObject& obj, |
} |
} |
- delegate_->printMessage(message + "\n"); |
+ delegate_->PrintMessage(message + "\n"); |
} |
} |
@@ -769,14 +767,14 @@ void WebTestProxyBase::StartDragging(blink::WebLocalFrame* frame, |
void WebTestProxyBase::DidChangeSelection(bool is_empty_callback) { |
if (test_interfaces_->GetTestRunner()->shouldDumpEditingCallbacks()) |
- delegate_->printMessage( |
+ delegate_->PrintMessage( |
"EDITING DELEGATE: " |
"webViewDidChangeSelection:WebViewDidChangeSelectionNotification\n"); |
} |
void WebTestProxyBase::DidChangeContents() { |
if (test_interfaces_->GetTestRunner()->shouldDumpEditingCallbacks()) |
- delegate_->printMessage( |
+ delegate_->PrintMessage( |
"EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification\n"); |
} |
@@ -789,7 +787,7 @@ bool WebTestProxyBase::CreateView(blink::WebLocalFrame* frame, |
if (!test_interfaces_->GetTestRunner()->canOpenWindows()) |
return false; |
if (test_interfaces_->GetTestRunner()->shouldDumpCreateView()) |
- delegate_->printMessage(std::string("createView(") + |
+ delegate_->PrintMessage(std::string("createView(") + |
URLDescription(request.url()) + ")\n"); |
return true; |
} |
@@ -805,14 +803,14 @@ blink::WebPlugin* WebTestProxyBase::CreatePlugin( |
void WebTestProxyBase::SetStatusText(const blink::WebString& text) { |
if (!test_interfaces_->GetTestRunner()->shouldDumpStatusCallbacks()) |
return; |
- delegate_->printMessage( |
+ delegate_->PrintMessage( |
std::string("UI DELEGATE STATUS CALLBACK: setStatusText:") + |
text.utf8().data() + "\n"); |
} |
void WebTestProxyBase::DidStopLoading() { |
if (test_interfaces_->GetTestRunner()->shouldDumpProgressFinishedCallback()) |
- delegate_->printMessage("postProgressFinishedNotification\n"); |
+ delegate_->PrintMessage("postProgressFinishedNotification\n"); |
} |
void WebTestProxyBase::ShowContextMenu( |
@@ -862,11 +860,11 @@ bool WebTestProxyBase::IsPointerLocked() { |
} |
void WebTestProxyBase::DidFocus() { |
- delegate_->setFocus(this, true); |
+ delegate_->SetFocus(this, true); |
} |
void WebTestProxyBase::DidBlur() { |
- delegate_->setFocus(this, false); |
+ delegate_->SetFocus(this, false); |
} |
void WebTestProxyBase::SetToolTipText(const blink::WebString& text, |
@@ -893,14 +891,14 @@ void WebTestProxyBase::LoadURLExternally( |
const blink::WebString& suggested_name) { |
if (test_interfaces_->GetTestRunner()->shouldWaitUntilExternalURLLoad()) { |
if (policy == blink::WebNavigationPolicyDownload) { |
- delegate_->printMessage( |
+ delegate_->PrintMessage( |
std::string("Downloading URL with suggested filename \"") + |
suggested_name.utf8() + "\"\n"); |
} else { |
- delegate_->printMessage(std::string("Loading URL externally - \"") + |
+ delegate_->PrintMessage(std::string("Loading URL externally - \"") + |
URLDescription(request.url()) + "\"\n"); |
} |
- delegate_->testFinished(); |
+ delegate_->TestFinished(); |
} |
} |
@@ -910,7 +908,7 @@ void WebTestProxyBase::DidStartProvisionalLoad(blink::WebLocalFrame* frame) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(" - didStartProvisionalLoadForFrame\n"); |
+ delegate_->PrintMessage(" - didStartProvisionalLoadForFrame\n"); |
} |
if (test_interfaces_->GetTestRunner() |
@@ -924,7 +922,7 @@ void WebTestProxyBase::DidReceiveServerRedirectForProvisionalLoad( |
blink::WebLocalFrame* frame) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage( |
+ delegate_->PrintMessage( |
" - didReceiveServerRedirectForProvisionalLoadForFrame\n"); |
} |
} |
@@ -933,7 +931,7 @@ bool WebTestProxyBase::DidFailProvisionalLoad(blink::WebLocalFrame* frame, |
const blink::WebURLError& error) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(" - didFailProvisionalLoadWithError\n"); |
+ delegate_->PrintMessage(" - didFailProvisionalLoadWithError\n"); |
} |
CheckDone(frame, MainResourceLoadFailed); |
return !frame->provisionalDataSource(); |
@@ -945,7 +943,7 @@ void WebTestProxyBase::DidCommitProvisionalLoad( |
blink::WebHistoryCommitType history_type) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(" - didCommitLoadForFrame\n"); |
+ delegate_->PrintMessage(" - didCommitLoadForFrame\n"); |
} |
} |
@@ -956,12 +954,12 @@ void WebTestProxyBase::DidReceiveTitle(blink::WebLocalFrame* frame, |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(std::string(" - didReceiveTitle: ") + |
+ delegate_->PrintMessage(std::string(" - didReceiveTitle: ") + |
title8.data() + "\n"); |
} |
if (test_interfaces_->GetTestRunner()->shouldDumpTitleChanges()) |
- delegate_->printMessage(std::string("TITLE CHANGED: '") + title8.data() + |
+ delegate_->PrintMessage(std::string("TITLE CHANGED: '") + title8.data() + |
"'\n"); |
} |
@@ -969,19 +967,19 @@ void WebTestProxyBase::DidChangeIcon(blink::WebLocalFrame* frame, |
blink::WebIconURL::Type icon_type) { |
if (test_interfaces_->GetTestRunner()->shouldDumpIconChanges()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(std::string(" - didChangeIcons\n")); |
+ delegate_->PrintMessage(std::string(" - didChangeIcons\n")); |
} |
} |
void WebTestProxyBase::DidFinishDocumentLoad(blink::WebLocalFrame* frame) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(" - didFinishDocumentLoadForFrame\n"); |
+ delegate_->PrintMessage(" - didFinishDocumentLoadForFrame\n"); |
} else { |
unsigned pendingUnloadEvents = frame->unloadListenerCount(); |
if (pendingUnloadEvents) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(base::StringPrintf( |
+ delegate_->PrintMessage(base::StringPrintf( |
" - has %u onunload handler(s)\n", pendingUnloadEvents)); |
} |
} |
@@ -990,7 +988,7 @@ void WebTestProxyBase::DidFinishDocumentLoad(blink::WebLocalFrame* frame) { |
void WebTestProxyBase::DidHandleOnloadEvents(blink::WebLocalFrame* frame) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(" - didHandleOnloadEventsForFrame\n"); |
+ delegate_->PrintMessage(" - didHandleOnloadEventsForFrame\n"); |
} |
} |
@@ -998,7 +996,7 @@ void WebTestProxyBase::DidFailLoad(blink::WebLocalFrame* frame, |
const blink::WebURLError& error) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(" - didFailLoadWithError\n"); |
+ delegate_->PrintMessage(" - didFailLoadWithError\n"); |
} |
CheckDone(frame, MainResourceLoadFailed); |
} |
@@ -1006,7 +1004,7 @@ void WebTestProxyBase::DidFailLoad(blink::WebLocalFrame* frame, |
void WebTestProxyBase::DidFinishLoad(blink::WebLocalFrame* frame) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(" - didFinishLoadForFrame\n"); |
+ delegate_->PrintMessage(" - didFinishLoadForFrame\n"); |
} |
CheckDone(frame, LoadFinished); |
} |
@@ -1015,13 +1013,13 @@ void WebTestProxyBase::DidDetectXSS(blink::WebLocalFrame* frame, |
const blink::WebURL& insecure_url, |
bool did_block_entire_page) { |
if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) |
- delegate_->printMessage("didDetectXSS\n"); |
+ delegate_->PrintMessage("didDetectXSS\n"); |
} |
void WebTestProxyBase::DidDispatchPingLoader(blink::WebLocalFrame* frame, |
const blink::WebURL& url) { |
if (test_interfaces_->GetTestRunner()->shouldDumpPingLoaderCallbacks()) |
- delegate_->printMessage(std::string("PingLoader dispatched to '") + |
+ delegate_->PrintMessage(std::string("PingLoader dispatched to '") + |
URLDescription(url).c_str() + "'.\n"); |
} |
@@ -1030,9 +1028,9 @@ void WebTestProxyBase::WillRequestResource( |
const blink::WebCachedURLRequest& request) { |
if (test_interfaces_->GetTestRunner()->shouldDumpResourceRequestCallbacks()) { |
PrintFrameDescription(delegate_, frame); |
- delegate_->printMessage(std::string(" - ") + |
+ delegate_->PrintMessage(std::string(" - ") + |
request.initiatorName().utf8().data()); |
- delegate_->printMessage(std::string(" requested '") + |
+ delegate_->PrintMessage(std::string(" requested '") + |
URLDescription(request.urlRequest().url()).c_str() + |
"'\n"); |
} |
@@ -1061,27 +1059,27 @@ void WebTestProxyBase::WillSendRequest( |
if (test_interfaces_->GetTestRunner()->shouldDumpResourceLoadCallbacks()) { |
if (resource_identifier_map_.find(identifier) == |
resource_identifier_map_.end()) |
- delegate_->printMessage("<unknown>"); |
+ delegate_->PrintMessage("<unknown>"); |
else |
- delegate_->printMessage(resource_identifier_map_[identifier]); |
- delegate_->printMessage(" - willSendRequest <NSURLRequest URL "); |
- delegate_->printMessage( |
+ delegate_->PrintMessage(resource_identifier_map_[identifier]); |
+ delegate_->PrintMessage(" - willSendRequest <NSURLRequest URL "); |
+ delegate_->PrintMessage( |
DescriptionSuitableForTestResult(request_url).c_str()); |
- delegate_->printMessage(", main document URL "); |
- delegate_->printMessage(URLDescription(main_document_url).c_str()); |
- delegate_->printMessage(", http method "); |
- delegate_->printMessage(request.httpMethod().utf8().data()); |
- delegate_->printMessage("> redirectResponse "); |
+ delegate_->PrintMessage(", main document URL "); |
+ delegate_->PrintMessage(URLDescription(main_document_url).c_str()); |
+ delegate_->PrintMessage(", http method "); |
+ delegate_->PrintMessage(request.httpMethod().utf8().data()); |
+ delegate_->PrintMessage("> redirectResponse "); |
PrintResponseDescription(delegate_, redirect_response); |
- delegate_->printMessage("\n"); |
+ delegate_->PrintMessage("\n"); |
} |
if (test_interfaces_->GetTestRunner()->shouldDumpResourcePriorities()) { |
- delegate_->printMessage( |
+ delegate_->PrintMessage( |
DescriptionSuitableForTestResult(request_url).c_str()); |
- delegate_->printMessage(" has priority "); |
- delegate_->printMessage(PriorityDescription(request.priority())); |
- delegate_->printMessage("\n"); |
+ delegate_->PrintMessage(" has priority "); |
+ delegate_->PrintMessage(PriorityDescription(request.priority())); |
+ delegate_->PrintMessage("\n"); |
} |
if (test_interfaces_->GetTestRunner()->httpHeadersToClear()) { |
@@ -1095,12 +1093,13 @@ void WebTestProxyBase::WillSendRequest( |
std::string host = url.host(); |
if (!host.empty() && (url.SchemeIs("http") || url.SchemeIs("https"))) { |
- if (!IsLocalHost(host) && !IsTestHost(host) && !HostIsUsedBySomeTestsToGenerateError(host) && |
+ if (!IsLocalHost(host) && !IsTestHost(host) && |
+ !HostIsUsedBySomeTestsToGenerateError(host) && |
((!main_document_url.SchemeIs("http") && |
!main_document_url.SchemeIs("https")) || |
IsLocalHost(main_document_url.host())) && |
- !delegate_->allowExternalPages()) { |
- delegate_->printMessage(std::string("Blocked access to external URL ") + |
+ !delegate_->AllowExternalPages()) { |
+ delegate_->PrintMessage(std::string("Blocked access to external URL ") + |
request_url + "\n"); |
BlockRequest(request); |
return; |
@@ -1108,7 +1107,7 @@ void WebTestProxyBase::WillSendRequest( |
} |
// Set the new substituted URL. |
- request.setURL(delegate_->rewriteLayoutTestsURL(request.url().spec())); |
+ request.setURL(delegate_->RewriteLayoutTestsURL(request.url().spec())); |
} |
void WebTestProxyBase::DidReceiveResponse( |
@@ -1118,24 +1117,24 @@ void WebTestProxyBase::DidReceiveResponse( |
if (test_interfaces_->GetTestRunner()->shouldDumpResourceLoadCallbacks()) { |
if (resource_identifier_map_.find(identifier) == |
resource_identifier_map_.end()) |
- delegate_->printMessage("<unknown>"); |
+ delegate_->PrintMessage("<unknown>"); |
else |
- delegate_->printMessage(resource_identifier_map_[identifier]); |
- delegate_->printMessage(" - didReceiveResponse "); |
+ delegate_->PrintMessage(resource_identifier_map_[identifier]); |
+ delegate_->PrintMessage(" - didReceiveResponse "); |
PrintResponseDescription(delegate_, response); |
- delegate_->printMessage("\n"); |
+ delegate_->PrintMessage("\n"); |
} |
if (test_interfaces_->GetTestRunner() |
->shouldDumpResourceResponseMIMETypes()) { |
GURL url = response.url(); |
blink::WebString mime_type = response.mimeType(); |
- delegate_->printMessage(url.ExtractFileName()); |
- delegate_->printMessage(" has MIME type "); |
+ delegate_->PrintMessage(url.ExtractFileName()); |
+ delegate_->PrintMessage(" has MIME type "); |
// Simulate NSURLResponse's mapping of empty/unknown MIME types to |
// application/octet-stream |
- delegate_->printMessage(mime_type.isEmpty() ? "application/octet-stream" |
+ delegate_->PrintMessage(mime_type.isEmpty() ? "application/octet-stream" |
: mime_type.utf8().data()); |
- delegate_->printMessage("\n"); |
+ delegate_->PrintMessage("\n"); |
} |
} |
@@ -1147,10 +1146,10 @@ void WebTestProxyBase::DidChangeResourcePriority( |
if (test_interfaces_->GetTestRunner()->shouldDumpResourcePriorities()) { |
if (resource_identifier_map_.find(identifier) == |
resource_identifier_map_.end()) |
- delegate_->printMessage("<unknown>"); |
+ delegate_->PrintMessage("<unknown>"); |
else |
- delegate_->printMessage(resource_identifier_map_[identifier]); |
- delegate_->printMessage( |
+ delegate_->PrintMessage(resource_identifier_map_[identifier]); |
+ delegate_->PrintMessage( |
base::StringPrintf(" changed priority to %s, intra_priority %d\n", |
PriorityDescription(priority).c_str(), |
intra_priority_value)); |
@@ -1162,10 +1161,10 @@ void WebTestProxyBase::DidFinishResourceLoad(blink::WebLocalFrame* frame, |
if (test_interfaces_->GetTestRunner()->shouldDumpResourceLoadCallbacks()) { |
if (resource_identifier_map_.find(identifier) == |
resource_identifier_map_.end()) |
- delegate_->printMessage("<unknown>"); |
+ delegate_->PrintMessage("<unknown>"); |
else |
- delegate_->printMessage(resource_identifier_map_[identifier]); |
- delegate_->printMessage(" - didFinishLoading\n"); |
+ delegate_->PrintMessage(resource_identifier_map_[identifier]); |
+ delegate_->PrintMessage(" - didFinishLoading\n"); |
} |
resource_identifier_map_.erase(identifier); |
#if !defined(ENABLE_LOAD_COMPLETION_HACKS) |
@@ -1198,9 +1197,9 @@ void WebTestProxyBase::DidAddMessageToConsole( |
level = "ERROR"; |
break; |
} |
- delegate_->printMessage(std::string("CONSOLE ") + level + ": "); |
+ delegate_->PrintMessage(std::string("CONSOLE ") + level + ": "); |
if (source_line) { |
- delegate_->printMessage(base::StringPrintf("line %d: ", source_line)); |
+ delegate_->PrintMessage(base::StringPrintf("line %d: ", source_line)); |
} |
if (!message.text.isEmpty()) { |
std::string new_message; |
@@ -1210,9 +1209,9 @@ void WebTestProxyBase::DidAddMessageToConsole( |
new_message = new_message.substr(0, file_protocol) + |
URLSuitableForTestResult(new_message.substr(file_protocol)); |
} |
- delegate_->printMessage(new_message); |
+ delegate_->PrintMessage(new_message); |
} |
- delegate_->printMessage(std::string("\n")); |
+ delegate_->PrintMessage(std::string("\n")); |
} |
void WebTestProxyBase::CheckDone(blink::WebLocalFrame* frame, |
@@ -1239,10 +1238,10 @@ blink::WebNavigationPolicy WebTestProxyBase::DecidePolicyForNavigation( |
if (!test_interfaces_->GetTestRunner()->policyDelegateEnabled()) |
return info.defaultPolicy; |
- delegate_->printMessage(std::string("Policy delegate: attempt to load ") + |
- URLDescription(info.urlRequest.url()) + |
- " with navigation type '" + |
- WebNavigationTypeToString(info.navigationType) + "'\n"); |
+ delegate_->PrintMessage( |
+ std::string("Policy delegate: attempt to load ") + |
+ URLDescription(info.urlRequest.url()) + " with navigation type '" + |
+ WebNavigationTypeToString(info.navigationType) + "'\n"); |
if (test_interfaces_->GetTestRunner()->policyDelegateIsPermissive()) |
result = blink::WebNavigationPolicyCurrentTab; |
else |
@@ -1259,7 +1258,7 @@ bool WebTestProxyBase::WillCheckAndDispatchMessageEvent( |
blink::WebSecurityOrigin target, |
blink::WebDOMMessageEvent event) { |
if (test_interfaces_->GetTestRunner()->shouldInterceptPostMessage()) { |
- delegate_->printMessage("intercepted postMessage\n"); |
+ delegate_->PrintMessage("intercepted postMessage\n"); |
return true; |
} |
@@ -1268,7 +1267,7 @@ bool WebTestProxyBase::WillCheckAndDispatchMessageEvent( |
void WebTestProxyBase::PostSpellCheckEvent(const blink::WebString& event_name) { |
if (test_interfaces_->GetTestRunner()->shouldDumpSpellCheckCallbacks()) { |
- delegate_->printMessage(std::string("SpellCheckEvent: ") + |
+ delegate_->PrintMessage(std::string("SpellCheckEvent: ") + |
event_name.utf8().data() + "\n"); |
} |
} |