Landing recent QUIC changes until 7:19 PM, Feb 26, 2016 UTC-5.

net/tools/quic/spdy_balsa_utils.cc

Index: net/tools/quic/spdy_balsa_utils.cc
diff --git a/net/tools/quic/spdy_balsa_utils.cc b/net/tools/quic/spdy_balsa_utils.cc
index d6132f9679c633d03845b90d61fcb26c5d7cceb6..dd24c9935d2476e93d9255408f6d5970da84ef07 100644
--- a/net/tools/quic/spdy_balsa_utils.cc
+++ b/net/tools/quic/spdy_balsa_utils.cc
@@ -227,16 +227,16 @@ SpdyHeaderBlock SpdyBalsaUtils::RequestHeadersToSpdyHeaders(
   if (url.empty() || url[0] == '/') {
     path = url;
   } else {
-    GURL request_uri(url);
+    std::unique_ptr<GURL> request_uri(new GURL(url));
     if (request_headers.request_method() == "CONNECT") {
       path = url;
     } else {
-      path = request_uri.path();
-      if (!request_uri.query().empty()) {
-        path = path + "?" + request_uri.query();
+      path = request_uri->path();
+      if (!request_uri->query().empty()) {
+        path = path + "?" + request_uri->query();
       }
-      host_and_port = request_uri.host();
-      scheme = request_uri.scheme();
+      host_and_port = request_uri->host();
+      scheme = request_uri->scheme();
     }
   }