Introduce logging to console and re-enable URLRequestTestHTTP.ProxyTunnelRedirectTest

BUG=96594
TEST=no


Review URL: http://codereview.chromium.org/7901014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101475 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 10 deletions

diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index faf1090..d0a8cb9 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -81,7 +81,8 @@ FilePath TestServer::HTTPSOptions::GetCertificateFile() const {
 
 TestServer::TestServer(Type type, const FilePath& document_root)
     : type_(type),
-      started_(false) {
+      started_(false),
+      log_to_console_(false) {
   Init(document_root);
 }
 
@@ -89,7 +90,8 @@ TestServer::TestServer(const HTTPSOptions& https_options,
                        const FilePath& document_root)
     : https_options_(https_options),
       type_(TYPE_HTTPS),
-      started_(false) {
+      started_(false),
+      log_to_console_(false) {
   Init(document_root);
 }
 
@@ -278,6 +280,10 @@ void TestServer::Init(const FilePath& document_root) {
                        .Append(FILE_PATH_LITERAL("data"))
                        .Append(FILE_PATH_LITERAL("ssl"))
                        .Append(FILE_PATH_LITERAL("certificates"));
+
+  // TODO(battre) Remove this after figuring out why the TestServer is flaky.
+  // http://crbug.com/96594
+  log_to_console_ = true;
 }
 
 bool TestServer::SetPythonPath() {
@@ -354,7 +360,7 @@ bool TestServer::AddCommandLineArguments(CommandLine* command_line) const {
   command_line->AppendArgNative(FILE_PATH_LITERAL("--data-dir=") +
                                 document_root_.value());
 
-  if (VLOG_IS_ON(1)) {
+  if (VLOG_IS_ON(1) || log_to_console_) {
     command_line->AppendArg("--log-to-console");
   }
 
diff --git a/net/test/test_server.h b/net/test/test_server.h
index 5efd6ba..8d6d8a2 100644
--- a/net/test/test_server.h
+++ b/net/test/test_server.h
@@ -206,6 +206,9 @@ class TestServer {
   // Has the server been started?
   bool started_;
 
+  // Enables logging of the server to the console.
+  bool log_to_console_;
+
   DISALLOW_COPY_AND_ASSIGN(TestServer);
 };
 
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index dd06230..44f6560 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -266,13 +266,7 @@ class URLRequestTestHTTP : public URLRequestTest {
 // issuing a CONNECT request with the magic host name "www.redirect.com".
 // The HTTPTestServer will return a 302 response, which we should not
 // follow.
-// See http://crbug.com/96594 for flakiness info.
-#if defined(TOOLKIT_VIEWS) && defined(DEBUG)
-#define MAYBE_ProxyTunnelRedirectTest FLAKY_ProxyTunnelRedirectTest
-#else
-#define MAYBE_ProxyTunnelRedirectTest ProxyTunnelRedirectTest
-#endif
-TEST_F(URLRequestTestHTTP, MAYBE_ProxyTunnelRedirectTest) {
+TEST_F(URLRequestTestHTTP, ProxyTunnelRedirectTest) {
   ASSERT_TRUE(test_server_.Start());
 
   TestNetworkDelegate network_delegate;  // must outlive URLRequest