summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi/file_writer_delegate.h
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 01:53:14 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-18 01:53:14 +0000
commit46d117e31ea6e7289cf795b992ac78b97b32de87 (patch)
tree4d02596713d15ad75cf9436c70bfa08db4b2bc3c /webkit/fileapi/file_writer_delegate.h
parente40e529933926b565d793a01d8aff5b0cc4ad560 (diff)
downloadchromium_src-46d117e31ea6e7289cf795b992ac78b97b32de87.zip
chromium_src-46d117e31ea6e7289cf795b992ac78b97b32de87.tar.gz
chromium_src-46d117e31ea6e7289cf795b992ac78b97b32de87.tar.bz2
Revert 118001 - 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 TBR=apatrick@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_writer_delegate.h')
-rw-r--r--webkit/fileapi/file_writer_delegate.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/fileapi/file_writer_delegate.h b/webkit/fileapi/file_writer_delegate.h
index 81f2d29..995b057 100644
--- a/webkit/fileapi/file_writer_delegate.h
+++ b/webkit/fileapi/file_writer_delegate.h
@@ -45,7 +45,7 @@ class FileWriterDelegate : public net::URLRequest::Delegate {
net::SSLCertRequestInfo* cert_request_info) OVERRIDE;
virtual void OnSSLCertificateError(net::URLRequest* request,
const net::SSLInfo& ssl_info,
- bool is_hsts_host) OVERRIDE;
+ bool fatal) OVERRIDE;
virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
virtual void OnReadCompleted(net::URLRequest* request,
int bytes_read) OVERRIDE;