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

components/spellcheck/renderer/spellcheck.cc

Index: components/spellcheck/renderer/spellcheck.cc
diff --git a/components/spellcheck/renderer/spellcheck.cc b/components/spellcheck/renderer/spellcheck.cc
index 2e3eed58a63a78b049900d13a11b0389d501e577..5ff06a25adfad656be0f3c5164f03baf3c97cdcd 100644
--- a/components/spellcheck/renderer/spellcheck.cc
+++ b/components/spellcheck/renderer/spellcheck.cc
@@ -263,7 +263,7 @@ void SpellCheck::OnRequestDocumentMarkers() {
 // AddSpellcheckLanguage() is called.
 void SpellCheck::AddSpellcheckLanguage(base::File file,
                                        const std::string& language) {
-  languages_.push_back(base::MakeUnique<SpellcheckLanguage>());
+  languages_.push_back(new SpellcheckLanguage());
   languages_.back()->Init(std::move(file), language);
 }
 
@@ -307,7 +307,9 @@ bool SpellCheck::SpellCheckWord(
     *misspelling_len = 0;
     suggestions_list.clear();
 
-    for (auto language = languages_.begin(); language != languages_.end();) {
+    for (ScopedVector<SpellcheckLanguage>::iterator language =
+             languages_.begin();
+         language != languages_.end();) {
       language_suggestions.clear();
       SpellcheckLanguage::SpellcheckWordResult result =
           (*language)->SpellCheckWord(
@@ -437,7 +439,7 @@ bool SpellCheck::InitializeIfNeeded() {
     return true;
 
   bool initialize_if_needed = false;
-  for (auto& language : languages_)
+  for (SpellcheckLanguage* language : languages_)
     initialize_if_needed |= language->InitializeIfNeeded();
 
   return initialize_if_needed;
@@ -462,7 +464,7 @@ void SpellCheck::PerformSpellCheck(SpellcheckRequest* param) {
 
   if (languages_.empty() ||
       std::find_if(languages_.begin(), languages_.end(),
-                   [](std::unique_ptr<SpellcheckLanguage>& language) {
+                   [](SpellcheckLanguage* language) {
                      return !language->IsEnabled();
                    }) != languages_.end()) {
     param->completion()->didCancelCheckingText();