Land Recent QUIC Changes.

net/quic/quic_utils.cc

 // Copyright (c) 2012 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/quic_utils.h"
 
 #include <ctype.h>
 
 #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;
 
 namespace net {
 
 // static
 uint64 QuicUtils::FNV1a_64_Hash(const char* data, int len) {
   static const uint64 kOffset = GG_UINT64_C(14695981039346656037);
   static const uint64 kPrime = GG_UINT64_C(1099511628211);
@@ skipping 252 matching lines @@
     bytes_remaining -= line_bytes;
     offset += line_bytes;
     p += line_bytes;
     s += '\n';
   }
   return s;
 }
 
 // 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