diff options
author | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 20:38:30 +0000 |
---|---|---|
committer | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 20:38:30 +0000 |
commit | b63f218a98a7dec9fd6dfb4e427d765fc95120fe (patch) | |
tree | 5976fcb7dfbdfbb233d30e2afed6e50ae8abb04f /webkit/tools/test_shell/test_shell.h | |
parent | e8234d36dc74d94f4921cadde17064ececae16b1 (diff) | |
download | chromium_src-b63f218a98a7dec9fd6dfb4e427d765fc95120fe.zip chromium_src-b63f218a98a7dec9fd6dfb4e427d765fc95120fe.tar.gz chromium_src-b63f218a98a7dec9fd6dfb4e427d765fc95120fe.tar.bz2 |
Implement layoutTestController.dumpResourceResponseMIMETypes in test_shell
(Chromium DRT side of this is in http://webkit.org/b/45479).
BUG=46872
TEST=fast/preloader and other layout tests now pass
Review URL: http://codereview.chromium.org/3317016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.h')
-rw-r--r-- | webkit/tools/test_shell/test_shell.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h index 4ddb592..e31ec67 100644 --- a/webkit/tools/test_shell/test_shell.h +++ b/webkit/tools/test_shell/test_shell.h @@ -92,7 +92,7 @@ public: static void CleanupLogging(); // Initialization and clean up of a static member variable. - static void InitializeTestShell(bool layout_test_mode, + static void InitializeTestShell(bool layout_test_mode, bool allow_external_pages); static void ShutdownTestShell(); @@ -187,6 +187,10 @@ public: return layout_test_mode_ && (test_is_preparing_ || test_is_pending_) && layout_test_controller_->ShouldDumpResourceLoadCallbacks(); } + bool ShouldDumpResourceResponseMIMETypes() { + return layout_test_mode_ && (test_is_preparing_ || test_is_pending_) && + layout_test_controller_->ShouldDumpResourceResponseMIMETypes(); + } bool ShouldDumpTitleChanges() { return layout_test_mode_ && layout_test_controller_->ShouldDumpTitleChanges(); @@ -380,9 +384,9 @@ private: // True when the app is being run using the --layout-tests switch. static bool layout_test_mode_; - + // True when we wish to allow test shell to load external pages like - // www.google.com even when in --layout-test mode (used for QA to + // www.google.com even when in --layout-test mode (used for QA to // produce images of the rendered page) static bool allow_external_pages_; |