diff options
| author | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 06:28:50 +0000 |
|---|---|---|
| committer | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 06:28:50 +0000 |
| commit | 1582387e898ffc722d7f34768e257d1d25b9cde8 (patch) | |
| tree | 1d0d81267afeac63c95d03dd4f9d1fd0fe1bd25b /chrome/browser/errorpage_browsertest.cc | |
| parent | b945425ee28d986f665f9a51ceadbc787ddef0e2 (diff) | |
| download | chromium_src-1582387e898ffc722d7f34768e257d1d25b9cde8.zip chromium_src-1582387e898ffc722d7f34768e257d1d25b9cde8.tar.gz chromium_src-1582387e898ffc722d7f34768e257d1d25b9cde8.tar.bz2 | |
Allow WebUI Tests to use preLoad in HtmlDialogUI.
- Refactor JsInjectionReadyObserver to its own header/impl files.
- Call JsInjectionReadyObserver::OnJsInjectionReady when the dialog
is shown.
- Move preamble generation to after the AddLibrary calls & generate setting
of preload_* variables rather than passing in browsePreload and
browsePrintPreload.
- Modify tests that show HtmlDialogUI to show the dialogs using preamble
rather than SetUpOnMainThread so AddLibrary & set_preload_* calls precede
showing the dialog (so preload is called against the appropriate fixture).
R=flackr@chromium.org, jhawkins@chromium.org
BUG=104371
TEST=browser_tests --gtest_filter=Hung*.* -AND- CertificateViewerUITest*.*
Review URL: http://codereview.chromium.org/8586009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_browsertest.cc')
| -rw-r--r-- | chrome/browser/errorpage_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index a1cc91b..b2829be 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -8,8 +8,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/test_navigation_observer.h" #include "chrome/test/base/ui_test_utils.h" -#include "chrome/test/test_navigation_observer.h" #include "content/browser/net/url_request_failed_dns_job.h" #include "content/browser/net/url_request_mock_http_job.h" |