Revert of Add quic_logging

net/tools/quic/end_to_end_test.cc

Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 6d99713c22aee36c5c0f55c4963c89f6f4cb374d..c2ca6dadc3b10d390a90e7e7d31702bc85123777 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -30,7 +30,6 @@
 #include "net/quic/core/quic_server_id.h"
 #include "net/quic/core/quic_session.h"
 #include "net/quic/core/quic_utils.h"
-#include "net/quic/platform/api/quic_logging.h"
 #include "net/quic/platform/api/quic_socket_address.h"
 #include "net/quic/platform/api/quic_str_cat.h"
 #include "net/quic/platform/api/quic_text_utils.h"
@@ -284,7 +283,7 @@
     server_supported_versions_ = GetParam().server_supported_versions;
     negotiated_version_ = GetParam().negotiated_version;
 
-    QUIC_LOG(INFO) << "Using Configuration: " << GetParam();
+    VLOG(1) << "Using Configuration: " << GetParam();
 
     // Use different flow control windows for client/server.
     client_config_.SetInitialStreamFlowControlWindowToSend(
@@ -339,29 +338,27 @@
 
   void set_client_initial_stream_flow_control_receive_window(uint32_t window) {
     CHECK(client_.get() == nullptr);
-    QUIC_DLOG(INFO) << "Setting client initial stream flow control window: "
-                    << window;
+    DVLOG(1) << "Setting client initial stream flow control window: " << window;
     client_config_.SetInitialStreamFlowControlWindowToSend(window);
   }
 
   void set_client_initial_session_flow_control_receive_window(uint32_t window) {
     CHECK(client_.get() == nullptr);
-    QUIC_DLOG(INFO) << "Setting client initial session flow control window: "
-                    << window;
+    DVLOG(1) << "Setting client initial session flow control window: "
+             << window;
     client_config_.SetInitialSessionFlowControlWindowToSend(window);
   }
 
   void set_server_initial_stream_flow_control_receive_window(uint32_t window) {
     CHECK(server_thread_.get() == nullptr);
-    QUIC_DLOG(INFO) << "Setting server initial stream flow control window: "
-                    << window;
+    DVLOG(1) << "Setting server initial stream flow control window: " << window;
     server_config_.SetInitialStreamFlowControlWindowToSend(window);
   }
 
   void set_server_initial_session_flow_control_receive_window(uint32_t window) {
     CHECK(server_thread_.get() == nullptr);
-    QUIC_DLOG(INFO) << "Setting server initial session flow control window: "
-                    << window;
+    DVLOG(1) << "Setting server initial session flow control window: "
+             << window;
     server_config_.SetInitialSessionFlowControlWindowToSend(window);
   }
 
@@ -1347,7 +1344,7 @@
       expected_congestion_control_type = kCubicBytes;
       break;
     default:
-      QUIC_DLOG(FATAL) << "Unexpected congestion control tag";
+      DLOG(FATAL) << "Unexpected congestion control tag";
   }
 
   server_thread_->Pause();
@@ -1946,9 +1943,9 @@
   void OnCompleteResponse(QuicStreamId id,
                           const SpdyHeaderBlock& response_headers,
                           const string& response_body) override {
-    QUIC_DVLOG(1) << "response for stream " << id << " "
-                  << response_headers.DebugString() << "\n"
-                  << response_body;
+    string debug_string = response_headers.DebugString();
+    DVLOG(1) << "response for stream " << id << " " << debug_string << "\n"
+             << response_body;
   }
 };
 
@@ -2218,7 +2215,7 @@
   // Damage the encrypted data.
   string damaged_packet(packet->data(), packet->length());
   damaged_packet[30] ^= 0x01;
-  QUIC_DLOG(INFO) << "Sending bad packet.";
+  DVLOG(1) << "Sending bad packet.";
   client_writer_->WritePacket(
       damaged_packet.data(), damaged_packet.length(),
       client_->client()->GetLatestClientAddress().host(), server_address_,
@@ -2254,7 +2251,7 @@
 
  protected:
   void SendErrorResponse() override {
-    QUIC_DLOG(INFO) << "Sending error response for stream " << id();
+    DVLOG(1) << "Sending error response for stream " << id();
     SpdyHeaderBlock headers;
     headers[":status"] = "500";
     headers["content-length"] =
@@ -2305,8 +2302,7 @@
         // No more data to read.
         break;
       }
-      QUIC_DVLOG(1) << "Processed " << iov.iov_len << " bytes for stream "
-                    << id();
+      DVLOG(1) << "Processed " << iov.iov_len << " bytes for stream " << id();
       MarkConsumed(iov.iov_len);
     }
 
@@ -2684,7 +2680,7 @@
       std::unique_ptr<QuicClientBase::ResponseListener>(
           new TestResponseListener));
 
-  QUIC_DVLOG(1) << "send request for /push_example";
+  DVLOG(1) << "send request for /push_example";
   EXPECT_EQ(kBody, client_->SendSynchronousRequest(
                        "https://example.com/push_example"));
   QuicHeadersStream* headers_stream =
@@ -2695,11 +2691,11 @@
   EXPECT_TRUE(QuicStreamSequencerPeer::IsUnderlyingBufferAllocated(sequencer));
 
   for (const string& url : push_urls) {
-    QUIC_DVLOG(1) << "send request for pushed stream on url " << url;
+    DVLOG(1) << "send request for pushed stream on url " << url;
     string expected_body =
         QuicStrCat("This is server push response body for ", url);
     string response_body = client_->SendSynchronousRequest(url);
-    QUIC_DVLOG(1) << "response body " << response_body;
+    DVLOG(1) << "response body " << response_body;
     EXPECT_EQ(expected_body, response_body);
   }
   EXPECT_NE(
@@ -2743,11 +2739,11 @@
   for (const string& url : push_urls) {
     // Sending subsequent requesets will not actually send anything on the wire,
     // as the responses are already in the client's cache.
-    QUIC_DVLOG(1) << "send request for pushed stream on url " << url;
+    DVLOG(1) << "send request for pushed stream on url " << url;
     string expected_body =
         QuicStrCat("This is server push response body for ", url);
     string response_body = client_->SendSynchronousRequest(url);
-    QUIC_DVLOG(1) << "response body " << response_body;
+    DVLOG(1) << "response body " << response_body;
     EXPECT_EQ(expected_body, response_body);
   }
   // Expect only original request has been sent and push responses have been
@@ -3019,7 +3015,7 @@
 class EndToEndBufferedPacketsTest : public EndToEndTest {
  public:
   void CreateClientWithWriter() override {
-    QUIC_LOG(ERROR) << "create client with reorder_writer_ ";
+    LOG(ERROR) << "create client with reorder_writer_ ";
     reorder_writer_ = new PacketReorderingWriter();
     client_.reset(EndToEndTest::CreateQuicClient(reorder_writer_));
   }