Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: net/base/upload_data.h

Issue 11275223: net: Change type of UploadData::elements from std::vector to ScopedVector (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/upload_data.h
diff --git a/net/base/upload_data.h b/net/base/upload_data.h
index d541ce4459b1a61cae63399c616de344ba3eb85c..2f0494ccffd3693017f4eab72a52bd0331f1581b 100644
--- a/net/base/upload_data.h
+++ b/net/base/upload_data.h
@@ -5,11 +5,10 @@
#ifndef NET_BASE_UPLOAD_DATA_H_
#define NET_BASE_UPLOAD_DATA_H_
-#include <vector>
-
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_vector.h"
#include "base/supports_user_data.h"
#include "net/base/net_export.h"
#include "net/base/upload_element.h"
@@ -61,17 +60,15 @@ class NET_EXPORT UploadData
void set_last_chunk_appended(bool set) { last_chunk_appended_ = set; }
bool last_chunk_appended() const { return last_chunk_appended_; }
- const std::vector<UploadElement>* elements() const {
- return &elements_;
+ const ScopedVector<UploadElement>& elements() const {
+ return elements_;
}
- std::vector<UploadElement>* elements_mutable() {
+ ScopedVector<UploadElement>* elements_mutable() {
return &elements_;
}
- void SetElements(const std::vector<UploadElement>& elements);
-
- void swap_elements(std::vector<UploadElement>* elements) {
+ void swap_elements(ScopedVector<UploadElement>* elements) {
elements_.swap(*elements);
}
@@ -86,7 +83,7 @@ class NET_EXPORT UploadData
virtual ~UploadData();
- std::vector<UploadElement> elements_;
+ ScopedVector<UploadElement> elements_;
int64 identifier_;
base::Closure chunk_callback_;
bool is_chunked_;

Powered by Google App Engine
This is Rietveld 408576698