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

components/spellcheck/renderer/spellcheck.h

 // 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.
 
 #ifndef COMPONENTS_SPELLCHECK_RENDERER_SPELLCHECK_H_
 #define COMPONENTS_SPELLCHECK_RENDERER_SPELLCHECK_H_
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
+#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "components/spellcheck/renderer/custom_dictionary_engine.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "content/public/renderer/render_thread_observer.h"
 
 struct SpellCheckBDictLanguage;
 class SpellcheckLanguage;
 struct SpellCheckResult;
 
@@ skipping 117 matching lines @@
   // The parameters of a pending background-spellchecking request. When WebKit
   // sends a background-spellchecking request before initializing hunspell,
   // we save its parameters and start spellchecking after we finish initializing
   // hunspell. (When WebKit sends two or more requests, we cancel the previous
   // requests so we do not have to use vectors.)
   std::unique_ptr<SpellcheckRequest> pending_request_param_;
 #endif
 
   // A vector of objects used to actually check spelling, one for each enabled
   // language.
-  std::vector<std::unique_ptr<SpellcheckLanguage>> languages_;
+  ScopedVector<SpellcheckLanguage> languages_;
 
   // Custom dictionary spelling engine.
   CustomDictionaryEngine custom_dictionary_;
 
   // Remember state for spellchecking.
   bool spellcheck_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellCheck);
 };
 
 #endif  // COMPONENTS_SPELLCHECK_RENDERER_SPELLCHECK_H_