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

components/spellcheck/renderer/spellcheck_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "components/spellcheck/renderer/spellcheck.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/spellcheck/common/spellcheck_common.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 #include "components/spellcheck/renderer/hunspell_engine.h"
 #include "components/spellcheck/renderer/spellcheck_language.h"
@@ skipping 42 matching lines @@
 
   void InitializeSpellCheck(const std::string& language) {
     base::FilePath hunspell_directory = GetHunspellDirectory();
     EXPECT_FALSE(hunspell_directory.empty());
     base::File file(
         spellcheck::GetVersionedFileName(language, hunspell_directory),
         base::File::FLAG_OPEN | base::File::FLAG_READ);
 #if defined(OS_MACOSX)
     // TODO(groby): Forcing spellcheck to use hunspell, even on OSX.
     // Instead, tests should exercise individual spelling engines.
-    spell_check_->languages_.push_back(base::MakeUnique<SpellcheckLanguage>());
+    spell_check_->languages_.push_back(new SpellcheckLanguage());
     spell_check_->languages_.front()->platform_spelling_engine_.reset(
         new HunspellEngine);
     spell_check_->languages_.front()->Init(std::move(file), language);
 #else
     spell_check_->AddSpellcheckLanguage(std::move(file), language);
 #endif
   }
 
   ~SpellCheckTest() override {}
 
@@ skipping 1468 matching lines @@
   // to be updated accordingly.
   ASSERT_EQ(5, spellcheck::kMaxSuggestions);
   FillSuggestions(suggestions_list, &suggestion_results);
   ASSERT_EQ(5U, suggestion_results.size());
   EXPECT_EQ(base::ASCIIToUTF16("0foo"), suggestion_results[0]);
   EXPECT_EQ(base::ASCIIToUTF16("1foo"), suggestion_results[1]);
   EXPECT_EQ(base::ASCIIToUTF16("2foo"), suggestion_results[2]);
   EXPECT_EQ(base::ASCIIToUTF16("0bar"), suggestion_results[3]);
   EXPECT_EQ(base::ASCIIToUTF16("1bar"), suggestion_results[4]);
 }