Land Recent QUIC Changes.

net/quic/quic_utils.cc

Index: net/quic/quic_utils.cc
diff --git a/net/quic/quic_utils.cc b/net/quic/quic_utils.cc
index a2662c52040cd32f2c3df3facf5ebe9a4d4b68b0..30ce56054d499bccdc719c9bd19baa0793a41681 100644
--- a/net/quic/quic_utils.cc
+++ b/net/quic/quic_utils.cc
@@ -8,11 +8,12 @@
 
 #include <algorithm>
 
+#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/port.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
-#include "net/spdy/write_blocked_list.h"
+#include "net/quic/quic_write_blocked_list.h"
 
 using base::StringPiece;
 using std::string;
@@ -285,12 +286,12 @@ string QuicUtils::StringToHexASCIIDump(StringPiece in_buffer) {
 
 // static
 QuicPriority QuicUtils::LowestPriority() {
-  return static_cast<QuicPriority>(kLowestPriority);
+  return QuicWriteBlockedList::kLowestPriority;
 }
 
 // static
 QuicPriority QuicUtils::HighestPriority() {
-  return static_cast<QuicPriority>(kHighestPriority);
+  return QuicWriteBlockedList::kHighestPriority;
 }
 
 }  // namespace net