Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/chromium/content/browser/streams/stream_url_request_job_unittest.cc b/chromium/content/browser/streams/stream_url_request_job_unittest.cc
index 8914fe5c50c..d3378032080 100644
--- a/chromium/content/browser/streams/stream_url_request_job_unittest.cc
+++ b/chromium/content/browser/streams/stream_url_request_job_unittest.cc
@@ -8,6 +8,8 @@
 #include "content/browser/streams/stream_registry.h"
 #include "content/browser/streams/stream_url_request_job.h"
 #include "content/browser/streams/stream_write_observer.h"
+#include "net/base/request_priority.h"
+#include "net/http/http_byte_range.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
@@ -73,7 +75,8 @@ class StreamURLRequestJobTest : public testing::Test {
                    int expected_status_code,
                    const std::string& expected_response) {
     net::TestDelegate delegate;
-    request_.reset(url_request_context_.CreateRequest(url, &delegate));
+    request_ = url_request_context_.CreateRequest(
+        url, net::DEFAULT_PRIORITY, &delegate);
     request_->set_method(method);
     if (!extra_headers.IsEmpty())
       request_->SetExtraRequestHeaders(extra_headers);
@@ -130,7 +133,8 @@ TEST_F(StreamURLRequestJobTest, TestGetLargeStreamRequest) {
 
 TEST_F(StreamURLRequestJobTest, TestGetNonExistentStreamRequest) {
   net::TestDelegate delegate;
-  request_.reset(url_request_context_.CreateRequest(kStreamURL, &delegate));
+  request_ = url_request_context_.CreateRequest(
+      kStreamURL, net::DEFAULT_PRIORITY, &delegate);
   request_->set_method("GET");
   request_->Start();
 
@@ -151,7 +155,8 @@ TEST_F(StreamURLRequestJobTest, TestRangeDataRequest) {
   stream->Finalize();
 
   net::HttpRequestHeaders extra_headers;
-  extra_headers.SetHeader(net::HttpRequestHeaders::kRange, "bytes=0-3");
+  extra_headers.SetHeader(net::HttpRequestHeaders::kRange,
+                          net::HttpByteRange::Bounded(0, 3).GetHeaderValue());
   TestRequest("GET", kStreamURL, extra_headers,
               200, std::string(kTestData2, 4));
 }
@@ -167,7 +172,8 @@ TEST_F(StreamURLRequestJobTest, TestInvalidRangeDataRequest) {
   stream->Finalize();
 
   net::HttpRequestHeaders extra_headers;
-  extra_headers.SetHeader(net::HttpRequestHeaders::kRange, "bytes=1-3");
+  extra_headers.SetHeader(net::HttpRequestHeaders::kRange,
+                          net::HttpByteRange::Bounded(1, 3).GetHeaderValue());
   TestRequest("GET", kStreamURL, extra_headers, 405, std::string());
 }