diff options
Diffstat (limited to 'chrome')
4 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 54893d5..6dad7c5 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -196,13 +196,13 @@ void ExtractRequestInfoBody(const net::URLRequest* request, keys::kRequestBodyRawKey }; - const std::vector<net::UploadElement>* elements = + const ScopedVector<net::UploadElement>& elements = request->get_upload()->elements(); bool some_succeeded = false; for (size_t i = 0; !some_succeeded && i < arraysize(presenters); ++i) { - std::vector<net::UploadElement>::const_iterator element; - for (element = elements->begin(); element != elements->end(); ++element) - presenters[i]->FeedNext(*element); + ScopedVector<net::UploadElement>::const_iterator element; + for (element = elements.begin(); element != elements.end(); ++element) + presenters[i]->FeedNext(**element); if (presenters[i]->Succeeded()) { requestBody->Set(kKeys[i], presenters[i]->Result().release()); some_succeeded = true; diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc index e01cc0a..0e7bf9a 100644 --- a/chrome/browser/policy/device_management_service_browsertest.cc +++ b/chrome/browser/policy/device_management_service_browsertest.cc @@ -49,10 +49,10 @@ class CannedResponseInterceptor : public net::URLRequest::Interceptor { if (request->url().GetOrigin() == service_url_.GetOrigin() && request->url().path() == service_url_.path() && upload != NULL && - upload->elements()->size() == 1) { + upload->elements().size() == 1) { std::string response_data; - ConstructResponse(upload->elements()->at(0).bytes(), - upload->elements()->at(0).bytes_length(), + ConstructResponse(upload->elements()[0]->bytes(), + upload->elements()[0]->bytes_length(), &response_data); return new net::URLRequestTestJob(request, network_delegate, diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index e5f1a08..8f28775 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -55,11 +55,11 @@ net::URLRequestJob* URLRequestFakerForPostRequests( const net::UploadData* upload_data = request->get_upload(); g_last_upload_bytes.Get().clear(); if (upload_data) { - const std::vector<net::UploadElement>* elements = upload_data->elements(); - for (size_t i = 0; elements && i < elements->size(); ++i) { - if ((*elements)[i].type() == net::UploadElement::TYPE_BYTES) { + const ScopedVector<net::UploadElement>& elements = upload_data->elements(); + for (size_t i = 0; i < elements.size(); ++i) { + if (elements[i]->type() == net::UploadElement::TYPE_BYTES) { g_last_upload_bytes.Get() += - std::string((*elements)[i].bytes(), (*elements)[i].bytes_length()); + std::string(elements[i]->bytes(), elements[i]->bytes_length()); } } } diff --git a/chrome/common/automation_messages.cc b/chrome/common/automation_messages.cc index 8aadece..1a60005 100644 --- a/chrome/common/automation_messages.cc +++ b/chrome/common/automation_messages.cc @@ -225,7 +225,7 @@ void ParamTraits<scoped_refptr<net::UploadData> >::Write(Message* m, const param_type& p) { WriteParam(m, p.get() != NULL); if (p) { - WriteParam(m, *p->elements()); + WriteParam(m, p->elements()); WriteParam(m, p->identifier()); WriteParam(m, p->is_chunked()); WriteParam(m, p->last_chunk_appended()); @@ -240,7 +240,7 @@ bool ParamTraits<scoped_refptr<net::UploadData> >::Read(const Message* m, return false; if (!has_object) return true; - std::vector<net::UploadElement> elements; + ScopedVector<net::UploadElement> elements; if (!ReadParam(m, iter, &elements)) return false; int64 identifier; |