diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 17:03:12 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 17:03:12 +0000 |
| commit | 1f1effe018bcd3afb1fb09e28c676485f13fc037 (patch) | |
| tree | 73df72d5ab751d4203d28644068d8a467004d165 /chrome_frame | |
| parent | c1e778cd581167d8cde4f1cc24fc78ef8c2fda8f (diff) | |
| download | chromium_src-1f1effe018bcd3afb1fb09e28c676485f13fc037.zip chromium_src-1f1effe018bcd3afb1fb09e28c676485f13fc037.tar.gz chromium_src-1f1effe018bcd3afb1fb09e28c676485f13fc037.tar.bz2 | |
Fix flake in chrome_frame_net_tests due to improper use of IE configurator.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10391051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/ie_configurator.cc | 1 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome_frame/test/ie_configurator.cc b/chrome_frame/test/ie_configurator.cc index d08a803..10c445f 100644 --- a/chrome_frame/test/ie_configurator.cc +++ b/chrome_frame/test/ie_configurator.cc @@ -461,6 +461,7 @@ IEConfigurator* CreateConfigurator() { switch (GetInstalledIEVersion()) { case IE_7: configurator = new IE7Configurator(); + break; case IE_9: configurator = new IE9Configurator(); break; diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 18914fd..6a6a884 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -518,8 +518,10 @@ void CFUrlRequestUnittestRunner::StartChromeFrameInHostBrowser() { // Tweak IE settings to make it amenable to testing before launching it. ie_configurator_.reset(chrome_frame_test::CreateConfigurator()); - if (ie_configurator_.get() != NULL) + if (ie_configurator_.get() != NULL) { + ie_configurator_->Initialize(); ie_configurator_->ApplySettings(); + } test_http_server_.reset(new test_server::SimpleWebServer(kTestServerPort)); test_http_server_->AddResponse(&chrome_frame_html_); |