diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 11:23:00 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 11:23:00 +0000 |
| commit | 32deb00d235a38a086f35547df76109a586d1f5f (patch) | |
| tree | c708022f3a4dc210ded689b7752aff2c8deba55c | |
| parent | bf160c588c95d802d120f68c3cb769f802cef848 (diff) | |
| download | chromium_src-32deb00d235a38a086f35547df76109a586d1f5f.zip chromium_src-32deb00d235a38a086f35547df76109a586d1f5f.tar.gz chromium_src-32deb00d235a38a086f35547df76109a586d1f5f.tar.bz2 | |
Attempt to re-enable ChromeFrame net tests.
Partial revert of r111705.
TBR=robertshield@chromium.org
BUG=105435
Review URL: http://codereview.chromium.org/8728027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111910 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 5a7d371..299f0f1 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -609,15 +609,13 @@ const char* IEVersionToString(IEVersion version) { } int main(int argc, char** argv) { - // TODO(joi): Remove the "true" part here and fix the log statement below. - if (true || chrome_frame_test::GetInstalledIEVersion() >= IE_9) { + if (chrome_frame_test::GetInstalledIEVersion() >= IE_9) { // Adding this here as the command line and the logging stuff gets // initialized in the NetTestSuite constructor. Did not want to break that. base::AtExitManager at_exit_manager; CommandLine::Init(argc, argv); CFUrlRequestUnittestRunner::InitializeLogging(); - LOG(INFO) << "Temporarily not running any ChromeFrame " - << "net tests (http://crbug.com/105435)"; + LOG(INFO) << "Not running ChromeFrame net tests on IE9+"; return 0; } |