Add quic_logging

net/quic/core/spdy_utils.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/spdy_utils.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/stl_util.h"
+#include "net/quic/platform/api/quic_logging.h"
 #include "net/quic/platform/api/quic_text_utils.h"
 #include "net/spdy/spdy_flags.h"
 #include "net/spdy/spdy_frame_builder.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_protocol.h"
 #include "url/gurl.h"
 
 using base::StringPiece;
 using base::ContainsKey;
 using std::string;
@@ skipping 35 matching lines @@
   if (it == headers->end()) {
     return false;
   } else {
     // Check whether multiple values are consistent.
     StringPiece content_length_header = it->second;
     std::vector<StringPiece> values =
         QuicTextUtils::Split(content_length_header, '\0');
     for (const StringPiece& value : values) {
       int64_t new_value;
       if (!base::StringToInt64(value, &new_value) || new_value < 0) {
-        DLOG(ERROR) << "Content length was either unparseable or negative.";
+        QUIC_DLOG(ERROR)
+            << "Content length was either unparseable or negative.";
         return false;
       }
       if (*content_length < 0) {
         *content_length = new_value;
         continue;
       }
       if (new_value != *content_length) {
-        DLOG(ERROR) << "Parsed content length " << new_value << " is "
-                    << "inconsistent with previously detected content length "
-                    << *content_length;
+        QUIC_DLOG(ERROR)
+            << "Parsed content length " << new_value << " is "
+            << "inconsistent with previously detected content length "
+            << *content_length;
         return false;
       }
     }
     return true;
   }
 }
 
 // static
 bool SpdyUtils::ParseTrailers(const char* data,
                               uint32_t data_len,
                               size_t* final_byte_offset,
                               SpdyHeaderBlock* trailers) {
   SpdyFramer framer(SpdyFramer::ENABLE_COMPRESSION);
   if (!framer.ParseHeaderBlockInBuffer(data, data_len, trailers) ||
       trailers->empty()) {
-    DVLOG(1) << "Request Trailers are invalid.";
+    QUIC_DVLOG(1) << "Request Trailers are invalid.";
     return false;  // Trailers were invalid.
   }
 
   // Pull out the final offset pseudo header which indicates the number of
   // response body bytes expected.
   auto it = trailers->find(kFinalOffsetHeaderKey);
   if (it == trailers->end() ||
       !base::StringToSizeT(it->second, final_byte_offset)) {
-    DVLOG(1) << "Required key '" << kFinalOffsetHeaderKey << "' not present";
+    QUIC_DVLOG(1) << "Required key '" << kFinalOffsetHeaderKey
+                  << "' not present";
     return false;
   }
   // The final offset header is no longer needed.
   trailers->erase(it->first);
 
   // Trailers must not have empty keys, and must not contain pseudo headers.
   for (const auto& trailer : *trailers) {
     StringPiece key = trailer.first;
     StringPiece value = trailer.second;
     if (QuicTextUtils::StartsWith(key, ":")) {
-      DVLOG(1) << "Trailers must not contain pseudo-header: '" << key << "','"
-               << value << "'.";
+      QUIC_DVLOG(1) << "Trailers must not contain pseudo-header: '" << key
+                    << "','" << value << "'.";
       return false;
     }
 
     // TODO(rjshade): Check for other forbidden keys, following the HTTP/2 spec.
   }
 
-  DVLOG(1) << "Successfully parsed Trailers.";
+  QUIC_DVLOG(1) << "Successfully parsed Trailers.";
   return true;
 }
 
 bool SpdyUtils::CopyAndValidateHeaders(const QuicHeaderList& header_list,
                                        int64_t* content_length,
                                        SpdyHeaderBlock* headers) {
   for (const auto& p : header_list) {
     const string& name = p.first;
     if (name.empty()) {
-      DVLOG(1) << "Header name must not be empty.";
+      QUIC_DVLOG(1) << "Header name must not be empty.";
       return false;
     }
 
     if (QuicTextUtils::ContainsUpperCase(name)) {
-      DVLOG(1) << "Malformed header: Header name " << name
-               << " contains upper-case characters.";
+      QUIC_DLOG(ERROR) << "Malformed header: Header name " << name
+                       << " contains upper-case characters.";
       return false;
     }
 
     headers->AppendValueOrAddHeader(name, p.second);
   }
 
   if (ContainsKey(*headers, "content-length") &&
       !ExtractContentLengthFromHeaders(content_length, headers)) {
     return false;
   }
 
-  DVLOG(1) << "Successfully parsed headers: " << headers->DebugString();
+  QUIC_DVLOG(1) << "Successfully parsed headers: " << headers->DebugString();
   return true;
 }
 
 bool SpdyUtils::CopyAndValidateTrailers(const QuicHeaderList& header_list,
                                         size_t* final_byte_offset,
                                         SpdyHeaderBlock* trailers) {
   bool found_final_byte_offset = false;
   for (const auto& p : header_list) {
     const string& name = p.first;
 
     // Pull out the final offset pseudo header which indicates the number of
     // response body bytes expected.
     int offset;
     if (!found_final_byte_offset && name == kFinalOffsetHeaderKey &&
         base::StringToInt(p.second, &offset)) {
       *final_byte_offset = offset;
       found_final_byte_offset = true;
       continue;
     }
 
     if (name.empty() || name[0] == ':') {
-      DVLOG(1) << "Trailers must not be empty, and must not contain pseudo-"
-               << "headers. Found: '" << name << "'";
+      QUIC_DVLOG(1)
+          << "Trailers must not be empty, and must not contain pseudo-"
+          << "headers. Found: '" << name << "'";
       return false;
     }
 
     if (QuicTextUtils::ContainsUpperCase(name)) {
-      DVLOG(1) << "Malformed header: Header name " << name
-               << " contains upper-case characters.";
+      QUIC_DLOG(INFO) << "Malformed header: Header name " << name
+                      << " contains upper-case characters.";
       return false;
     }
 
     if (trailers->find(name) != trailers->end()) {
-      DVLOG(1) << "Duplicate header '" << name << "' found in trailers.";
+      QUIC_DLOG(INFO) << "Duplicate header '" << name << "' found in trailers.";
       return false;
     }
 
     (*trailers)[name] = p.second;
   }
 
   if (!found_final_byte_offset) {
-    DVLOG(1) << "Required key '" << kFinalOffsetHeaderKey << "' not present";
+    QUIC_DVLOG(1) << "Required key '" << kFinalOffsetHeaderKey
+                  << "' not present";
     return false;
   }
 
   // TODO(rjshade): Check for other forbidden keys, following the HTTP/2 spec.
 
-  DVLOG(1) << "Successfully parsed Trailers: " << trailers->DebugString();
+  QUIC_DVLOG(1) << "Successfully parsed Trailers: " << trailers->DebugString();
   return true;
 }
 
 // static
 string SpdyUtils::GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers) {
   SpdyHeaderBlock::const_iterator it = headers.find(":scheme");
   if (it == headers.end()) {
     return "";
   }
   std::string url = it->second.as_string();
@@ skipping 40 matching lines @@
     (*headers)[":authority"] = url.substr(start);
     (*headers)[":path"] = "/";
     return true;
   }
   (*headers)[":authority"] = url.substr(start, pos - start);
   (*headers)[":path"] = url.substr(pos);
   return true;
 }
 
 }  // namespace net