Rewrite BufferedDataSource tests to use real BufferedResourceLoader objects.

webkit/media/response_generator.cc

+// Copyright (c) 2011 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 "webkit/media/response_generator.h"
+
+#include "base/format_macros.h"
+#include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
+#include "net/base/net_errors.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
+
+using WebKit::WebString;
+using WebKit::WebURLError;
+using WebKit::WebURLResponse;
+
+namespace webkit_media {
+
+ResponseGenerator::ResponseGenerator(const GURL& gurl, int64 content_length)
+    : gurl_(gurl),
+      content_length_(content_length) {
+}
+
+WebURLError ResponseGenerator::GenerateError() {
+  WebURLError error;
+  error.reason = net::ERR_ABORTED;
+  error.domain = WebString::fromUTF8(net::kErrorDomain);
+  return error;
+}
+
+WebURLResponse ResponseGenerator::Generate200() {
+  WebURLResponse response(gurl_);
+  response.setHTTPStatusCode(200);
+
+  response.setHTTPHeaderField(
+      WebString::fromUTF8("Content-Length"),
+      WebString::fromUTF8(base::Int64ToString(content_length_)));
+  response.setExpectedContentLength(content_length_);
+  return response;
+}
+
+WebURLResponse ResponseGenerator::Generate206(int64 first_byte_offset) {
+  return Generate206(first_byte_offset, kNormal);
+}
+
+WebURLResponse ResponseGenerator::Generate206(int64 first_byte_offset,
+                                              Flags flags) {
+  int64 range_content_length = content_length_ - first_byte_offset;
+  int64 last_byte_offset = content_length_ - first_byte_offset - 1;

[Ami GONE FROM CHROMIUM, 2011/11/22 22:06:23]

What the what?
A 10-byte file, requesting starting from byte 3, will return:
3-6/10
instead of 
3-9/10
?

[scherkus (not reviewing), 2011/11/23 04:22:41]

whoops!

+
+  WebURLResponse response(gurl_);
+  response.setHTTPStatusCode(206);
+
+  if ((flags & kNoAcceptRanges) == 0) {
+    response.setHTTPHeaderField(WebString::fromUTF8("Accept-Ranges"),
+                                WebString::fromUTF8("bytes"));
+  }
+
+  if ((flags & kNoContentRange) == 0) {
+    std::string content_range = base::StringPrintf(
+        "bytes %" PRId64 "-%" PRId64 "/%" PRId64,
+        first_byte_offset, last_byte_offset, content_length_);
+    response.setHTTPHeaderField(WebString::fromUTF8("Content-Range"),
+                                WebString::fromUTF8(content_range));
+  }
+
+  if ((flags & kNoContentLength) == 0) {
+    response.setHTTPHeaderField(
+        WebString::fromUTF8("Content-Length"),
+        WebString::fromUTF8(base::Int64ToString(range_content_length)));
+    response.setExpectedContentLength(range_content_length);
+  }
+  return response;
+}
+
+WebURLResponse ResponseGenerator::Generate404() {
+  WebURLResponse response(gurl_);
+  response.setHTTPStatusCode(404);
+  return response;
+}
+
+}  // namespace webkit_media