summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 00:48:27 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 00:48:27 +0000
commitdfe3aad2dac8cd555e8f66085218a1c44e386fa4 (patch)
treea5e39b790672e21b7d4438c4b41bf0f67caf58fa /webkit/tools/test_shell
parentbc2434b67ce05143b934f011ed551a39ebfd5e5a (diff)
downloadchromium_src-dfe3aad2dac8cd555e8f66085218a1c44e386fa4.zip
chromium_src-dfe3aad2dac8cd555e8f66085218a1c44e386fa4.tar.gz
chromium_src-dfe3aad2dac8cd555e8f66085218a1c44e386fa4.tar.bz2
Revert 117968 - Rename is_hsts_host to fatal.
Per wtc: the old name was too specific, and became confusing because we now also have certificate errors that users cannot override, but for reasons other than (although still closely related to) HSTS. Failures were: http://chromegw.corp.google.com/i/chromium/builders/XP%20Tests%20%28dbg%29%286%29/builds/7935 http://chromegw.corp.google.com/i/chromium/builders/XP%20Tests%20%28dbg%29%282%29/builds/13488 (view as text) WorkerFileSystemTest.FileWriterSyncTruncateExtend: [1132:3724:0117/155729:2434562:INFO:ui_layout_test.cc(57)] Assume LayoutTests in E:\b\build\slave\XP_Tests__dbg__6_\build\src\chrome\test\data\layout_tests\LayoutTests [1132:3724:0117/155729:2434562:INFO:ui_layout_test.cc(143)] Assume LayoutTests in fast\filesystem [1132:3724:0117/155730:2434765:INFO:ui_layout_test.cc(143)] Assume LayoutTests in fast\js .\test\ui\ui_test.cc(720): error: Failed Timeout reached in WaitUntilCookieNonEmpty Google Test trace: .\test\ui\ui_layout_test.cc(174): file-writer-sync-truncate-extend.html .\test\ui\ui_layout_test.cc(254): error: Value of: inner_text.c_str() Actual: "[Worker] Test using FileWriterSync.truncate to extend a file. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". Starting worker: ../resources/file-writer-sync-truncate-extend.js " Expected: expected_result_value.c_str() Which is: "[Worker] Test using FileWriterSync.truncate to extend a file. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". Starting worker: ../resources/file-writer-sync-truncate-extend.js PASS [Worker] Truncate extension verified. PASS successfullyParsed is true TEST COMPLETE " Google Test trace: .\test\ui\ui_layout_test.cc(174): file-writer-sync-truncate-extend.html BUG=109941 Review URL: https://chromiumcodereview.appspot.com/9188019 TBR=palmer@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/simple_resource_loader_bridge.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 102f7ac..958d662 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -465,7 +465,7 @@ class RequestProxy : public net::URLRequest::Delegate,
virtual void OnSSLCertificateError(net::URLRequest* request,
const net::SSLInfo& ssl_info,
- bool fatal) OVERRIDE {
+ bool is_hsts_host) OVERRIDE {
// Allow all certificate errors.
request->ContinueDespiteLastError();
}