summaryrefslogtreecommitdiff
path: root/chromium/net/base/upload_bytes_element_reader.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-25 11:39:07 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-01-25 15:20:42 +0000
commit6c91641271e536ffaa88a1dff5127e42ee99a91e (patch)
tree703d9dd49602377ddc90cbf886aad37913f2496b /chromium/net/base/upload_bytes_element_reader.cc
parentb145b7fafd36f0c260d6a768c81fc14e32578099 (diff)
downloadqtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/net/base/upload_bytes_element_reader.cc')
-rw-r--r--chromium/net/base/upload_bytes_element_reader.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chromium/net/base/upload_bytes_element_reader.cc b/chromium/net/base/upload_bytes_element_reader.cc
index fd74dd80e55..b8b0f0103fb 100644
--- a/chromium/net/base/upload_bytes_element_reader.cc
+++ b/chromium/net/base/upload_bytes_element_reader.cc
@@ -5,7 +5,6 @@
#include "net/base/upload_bytes_element_reader.h"
#include "base/logging.h"
-#include "base/stl_util.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -59,10 +58,9 @@ int UploadBytesElementReader::Read(IOBuffer* buf,
return num_bytes_to_read;
}
-
UploadOwnedBytesElementReader::UploadOwnedBytesElementReader(
std::vector<char>* data)
- : UploadBytesElementReader(vector_as_array(data), data->size()) {
+ : UploadBytesElementReader(data->data(), data->size()) {
data_.swap(*data);
}