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

8 files changed, 19 insertions, 8 deletions

diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 126863e..f5856bd 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -457,7 +457,7 @@ void URLRequestAutomationJob::StartAsync() {
   automation_request.method = request_->method();
   automation_request.referrer = referrer.spec();
   automation_request.extra_request_headers = new_request_headers.ToString();
-  automation_request.upload_data =request_->get_upload();
+  automation_request.upload_data = request_->get_upload_mutable();
   automation_request.resource_type = resource_type;
   automation_request.load_flags = request_->load_flags();
 
diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc
index 79e84c2..12e5ba5 100644
--- a/chrome/browser/policy/device_management_service_browsertest.cc
+++ b/chrome/browser/policy/device_management_service_browsertest.cc
@@ -44,7 +44,7 @@ class CannedResponseInterceptor : public net::URLRequest::Interceptor {
   virtual net::URLRequestJob* MaybeIntercept(
       net::URLRequest* request) OVERRIDE {
     em::DeviceManagementRequest dm_request;
-    net::UploadData* upload = request->get_upload();
+    net::UploadData* upload = request->get_upload_mutable();
     if (request->url().GetOrigin() == service_url_.GetOrigin() &&
         request->url().path() == service_url_.path() &&
         upload != NULL &&
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;
diff --git a/webkit/blob/blob_storage_controller.cc b/webkit/blob/blob_storage_controller.cc
index 9dcbc33..79508fc 100644
--- a/webkit/blob/blob_storage_controller.cc
+++ b/webkit/blob/blob_storage_controller.cc
@@ -173,7 +173,8 @@ void BlobStorageController::ResolveBlobReferencesInUploadData(
     net::UploadData* upload_data) {
   DCHECK(upload_data);
 
-  std::vector<net::UploadData::Element>* uploads = upload_data->elements();
+  std::vector<net::UploadData::Element>* uploads =
+      upload_data->elements_mutable();
   std::vector<net::UploadData::Element>::iterator iter;
   for (iter = uploads->begin(); iter != uploads->end();) {
     if (iter->type() != net::UploadData::TYPE_BLOB) {
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index f11f985..8519e42 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -616,7 +616,7 @@ class RequestProxy
 
     // GetContentLengthSync() may perform file IO, but it's ok here, as file
     // IO is not prohibited in IOThread defined in the file.
-    uint64 size = request_->get_upload()->GetContentLengthSync();
+    uint64 size = request_->get_upload_mutable()->GetContentLengthSync();
     uint64 position = request_->GetUploadProgress();
     if (position == last_upload_position_)
       return;  // no progress made since last time