Remove ScopedVector from search_engines.

ios/chrome/browser/search_engines/search_engines_util.cc

 // Copyright 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 "ios/chrome/browser/search_engines/search_engines_util.h"
 
 #include <stddef.h>
 
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
@@ skipping 10 matching lines @@
 // Id of the google id in template_url_prepopulate_data.cc.
 static const int kGoogleEnginePrepopulatedId = 1;
 
 // Update the search engine of the given service to the default ones for the
 // current locale.
 void UpdateSearchEngine(TemplateURLService* service) {
   DCHECK(service);
   DCHECK(service->loaded());
   std::vector<TemplateURL*> old_engines = service->GetTemplateURLs();
   size_t default_engine;
-  ScopedVector<TemplateURLData> new_engines =
+  std::vector<std::unique_ptr<TemplateURLData>> new_engines =
       TemplateURLPrepopulateData::GetPrepopulatedEngines(nullptr,
                                                          &default_engine);
   DCHECK(default_engine == 0);
   DCHECK(new_engines[0]->prepopulate_id == kGoogleEnginePrepopulatedId);
   // The aim is to replace the old search engines with the new ones.
   // It is not possible to remove all of them, because removing the current
   // selected engine is not allowed.
   // It is not possible to add all the new ones first, because the service gets
   // confused when a prepopulated engine is there more than once.
   // Instead, this will in a first pass makes google as the default engine. In
-  // a second pass, it will remove all other search engine. At last, in a third
-  // pass, it will add all new engine but google.
+  // a second pass, it will remove all other search engines. At last, in a third
+  // pass, it will add all new engines but google.
   for (auto* engine : old_engines) {
     if (engine->prepopulate_id() == kGoogleEnginePrepopulatedId)
       service->SetUserSelectedDefaultSearchProvider(engine);
   }
   for (auto* engine : old_engines) {
     if (engine->prepopulate_id() != kGoogleEnginePrepopulatedId)
       service->Remove(engine);
   }
-  ScopedVector<TemplateURLData>::iterator it = new_engines.begin();
-  while (it != new_engines.end()) {
-    if ((*it)->prepopulate_id != kGoogleEnginePrepopulatedId) {
-      // service->Add takes ownership on Added TemplateURL.
-      service->Add(base::MakeUnique<TemplateURL>(**it));
-      it = new_engines.weak_erase(it);

[droger, 2016/09/02 08:34:26]

If I understand correctly this was a memory leak. Can you expand the description
of the CL to mention that this is also fixing a memory leak in addition to doing
the scoped vector conversion?

[Avi (use Gerrit), 2016/09/02 14:39:38]

Yes, this was a memory leak; we were constructing based on an object and then
leaking it.

Sure.

-    } else {
-      ++it;
-    }
+  for (const auto& engine : new_engines) {
+    if (engine->prepopulate_id != kGoogleEnginePrepopulatedId)
+      service->Add(base::MakeUnique<TemplateURL>(*engine));
   }
 }
 
 // Observer class that allows to wait for the TemplateURLService to be loaded.
 // This class will delete itself as soon as the TemplateURLService is loaded.
 class LoadedObserver : public TemplateURLServiceObserver {
  public:
   explicit LoadedObserver(TemplateURLService* service) : service_(service) {
     DCHECK(service_);
     DCHECK(!service_->loaded());
@@ skipping 38 matching lines @@
   // removed then the engines can be updated again.
   if (!service || service->is_default_search_managed())
     return;
   if (service->loaded())
     UpdateSearchEngine(service);
   else
     new LoadedObserver(service);  // The observer manages its own lifetime.
 }
 
 }  // namespace search_engines