Merge 3004: Revert of Remove ScopedVector in components/spellcheck (patchset #5 id:80001 of https:/…

components/spellcheck/browser/feedback_sender.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // The |FeedbackSender| object stores the user feedback to spellcheck
 // suggestions in a |Feedback| object.
 //
 // When spelling service returns spellcheck results, these results first arrive
 // in |FeedbackSender| to assign hash identifiers for each
 // misspelling-suggestion pair. If the spelling service identifies the same
@@ skipping 358 matching lines @@
 
   FlushFeedback();
   timer_.Stop();
 }
 
 void FeedbackSender::RandBytes(void* p, size_t len) {
   crypto::RandBytes(p, len);
 }
 
 void FeedbackSender::OnURLFetchComplete(const net::URLFetcher* source) {
-  for (auto sender_it = senders_.begin(); sender_it != senders_.end();
+  for (ScopedVector<net::URLFetcher>::iterator sender_it = senders_.begin();
+       sender_it != senders_.end();
        ++sender_it) {
-    if ((*sender_it).get() == source) {
+    if (*sender_it == source) {
       senders_.erase(sender_it);
       return;
     }
   }
   delete source;
 }
 
 void FeedbackSender::RequestDocumentMarkers() {
   // Request document markers from all the renderers that are still alive.
   std::set<int> alive_renderers;
@@ skipping 41 matching lines @@
   std::unique_ptr<base::Value> feedback_value(BuildFeedbackValue(
       BuildParams(
           BuildSuggestionInfo(feedback_data, is_first_feedback_batch, salt_),
           language_, country_),
       api_version_));
   std::string feedback;
   base::JSONWriter::Write(*feedback_value, &feedback);
 
   // The tests use this identifier to mock the URL fetcher.
   static const int kUrlFetcherId = 0;
-  auto sender = net::URLFetcher::Create(kUrlFetcherId, feedback_service_url_,
-                                        net::URLFetcher::POST, this);
+  net::URLFetcher* sender =
+      net::URLFetcher::Create(kUrlFetcherId, feedback_service_url_,
+                              net::URLFetcher::POST, this).release();
   data_use_measurement::DataUseUserData::AttachToFetcher(
-      sender.get(), data_use_measurement::DataUseUserData::SPELL_CHECKER);
+      sender, data_use_measurement::DataUseUserData::SPELL_CHECKER);
   sender->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                        net::LOAD_DO_NOT_SAVE_COOKIES);
   sender->SetUploadData("application/json", feedback);
-  senders_.push_back(std::move(sender));
+  senders_.push_back(sender);
 
   // Request context is nullptr in testing.
   if (request_context_.get()) {
     sender->SetRequestContext(request_context_.get());
     sender->Start();
   }
 }
 
 }  // namespace spellcheck