Index: components/spellcheck/browser/feedback_sender.cc |
diff --git a/components/spellcheck/browser/feedback_sender.cc b/components/spellcheck/browser/feedback_sender.cc |
index 5d7e8d00bd8c8c8747c3896f32ce9a7664210b14..80d3f58fa3ee60e16c820013921c36068c969310 100644 |
--- a/components/spellcheck/browser/feedback_sender.cc |
+++ b/components/spellcheck/browser/feedback_sender.cc |
@@ -37,6 +37,7 @@ |
#include "base/hash.h" |
#include "base/json/json_writer.h" |
#include "base/location.h" |
+#include "base/memory/ptr_util.h" |
#include "base/metrics/field_trial.h" |
#include "base/single_thread_task_runner.h" |
#include "base/stl_util.h" |
@@ -376,10 +377,9 @@ void FeedbackSender::RandBytes(void* p, size_t len) { |
} |
void FeedbackSender::OnURLFetchComplete(const net::URLFetcher* source) { |
- for (ScopedVector<net::URLFetcher>::iterator sender_it = senders_.begin(); |
- sender_it != senders_.end(); |
+ for (auto sender_it = senders_.begin(); sender_it != senders_.end(); |
++sender_it) { |
- if (*sender_it == source) { |
+ if ((*sender_it).get() == source) { |
senders_.erase(sender_it); |
return; |
} |
@@ -449,7 +449,7 @@ void FeedbackSender::SendFeedback(const std::vector<Misspelling>& feedback_data, |
sender->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | |
net::LOAD_DO_NOT_SAVE_COOKIES); |
sender->SetUploadData("application/json", feedback); |
- senders_.push_back(sender); |
+ senders_.push_back(base::WrapUnique<net::URLFetcher>(sender)); |
groby-ooo-7-16
2017/01/26 17:40:47
This should probably be a unique_ptr from creation
ke.he
2017/01/27 03:15:40
Done.
|
// Request context is nullptr in testing. |
if (request_context_.get()) { |