diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 11:51:39 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 11:51:39 +0000 |
| commit | ed7b123cdab30a82f0517671605666e9fffe4928 (patch) | |
| tree | 97a3c3d4182ad4ed08c9054f4968db91f116cf80 | |
| parent | 56c3da9b32d58ca456b092a51aba997aa857f047 (diff) | |
| download | chromium_src-ed7b123cdab30a82f0517671605666e9fffe4928.zip chromium_src-ed7b123cdab30a82f0517671605666e9fffe4928.tar.gz chromium_src-ed7b123cdab30a82f0517671605666e9fffe4928.tar.bz2 | |
Revert 111910 - Attempt to re-enable ChromeFrame net tests.
Partial revert of r111705.
TBR=robertshield@chromium.org
BUG=105435
Review URL: http://codereview.chromium.org/8728027
TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/8726032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111914 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 299f0f1..5a7d371 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -609,13 +609,15 @@ const char* IEVersionToString(IEVersion version) { } int main(int argc, char** argv) { - if (chrome_frame_test::GetInstalledIEVersion() >= IE_9) { + // TODO(joi): Remove the "true" part here and fix the log statement below. + if (true || 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) << "Not running ChromeFrame net tests on IE9+"; + LOG(INFO) << "Temporarily not running any ChromeFrame " + << "net tests (http://crbug.com/105435)"; return 0; } |