summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorvabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-28 22:01:30 +0000
committervabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-28 22:01:30 +0000
commit6f5e4bca37e94a6afffecafbf1db67aa45a35b17 (patch)
treed269b84593d66b5c00dcfc2d19e7253e5b8f6c15 /net
parent5281d42753964dc2c56e25af33c29cc693da8da5 (diff)
downloadchromium_src-6f5e4bca37e94a6afffecafbf1db67aa45a35b17.zip
chromium_src-6f5e4bca37e94a6afffecafbf1db67aa45a35b17.tar.gz
chromium_src-6f5e4bca37e94a6afffecafbf1db67aa45a35b17.tar.bz2
Add const accessors to URLRequest and UploadData.
These const accessors are needed in my other CL 10694055. The accessors are very simple, so I duplicated the code rather than const-casting the const accessor to implement the non-const. BUG=N/A TEST=N/A (no fix & no new feature) TBR=jianli@chromium.org,darin@chromium.org,joaodasilva@chromium.org Review URL: https://chromiumcodereview.appspot.com/10832003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/upload_data.h6
-rw-r--r--net/base/upload_data_stream.cc3
-rw-r--r--net/url_request/url_request.cc6
-rw-r--r--net/url_request/url_request.h3
4 files changed, 14 insertions, 4 deletions
diff --git a/net/base/upload_data.h b/net/base/upload_data.h
index bd0d223..ab6186b 100644
--- a/net/base/upload_data.h
+++ b/net/base/upload_data.h
@@ -223,7 +223,11 @@ class NET_EXPORT UploadData
// reused for a new UploadDataStream.
void ResetOffset();
- std::vector<Element>* elements() {
+ const std::vector<Element>* elements() const {
+ return &elements_;
+ }
+
+ std::vector<Element>* elements_mutable() {
return &elements_;
}
diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
index 9791a91..6c78f95 100644
--- a/net/base/upload_data_stream.cc
+++ b/net/base/upload_data_stream.cc
@@ -70,7 +70,8 @@ int UploadDataStream::Init() {
}
int UploadDataStream::Read(IOBuffer* buf, int buf_len) {
- std::vector<UploadData::Element>& elements = *upload_data_->elements();
+ std::vector<UploadData::Element>& elements =
+ *upload_data_->elements_mutable();
int bytes_copied = 0;
while (bytes_copied < buf_len && element_index_ < elements.size()) {
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index eac80f4b..8ea6325 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -238,7 +238,11 @@ void URLRequest::set_upload(UploadData* upload) {
}
// Get the upload data directly.
-UploadData* URLRequest::get_upload() {
+const UploadData* URLRequest::get_upload() const {
+ return upload_.get();
+}
+
+UploadData* URLRequest::get_upload_mutable() {
return upload_.get();
}
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index a401c58..59b5a28 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -413,7 +413,8 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
void set_upload(UploadData* upload);
// Get the upload data directly.
- UploadData* get_upload();
+ const UploadData* get_upload() const;
+ UploadData* get_upload_mutable();
// Returns true if the request has a non-empty message body to upload.
bool has_upload() const;