Fix memory leak in unit test...

chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

 // Copyright (c) 2010 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 "base/scoped_temp_dir.h"
 #include "base/scoped_vector.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 49 matching lines @@
                 'T'<<8|'L', 'T'<<8|'M', 'T'<<8|'N', 'T'<<8|'O', 'T'<<8|'R',
                 'T'<<8|'T', 'T'<<8|'V', 'T'<<8|'W', 'T'<<8|'Z', 'U'<<8|'A',
                 'U'<<8|'G', 'U'<<8|'M', 'U'<<8|'S', 'U'<<8|'Y', 'U'<<8|'Z',
                 'V'<<8|'A', 'V'<<8|'C', 'V'<<8|'E', 'V'<<8|'G', 'V'<<8|'I',
                 'V'<<8|'N', 'V'<<8|'U', 'W'<<8|'F', 'W'<<8|'S', 'Y'<<8|'E',
                 'Y'<<8|'T', 'Z'<<8|'A', 'Z'<<8|'M', 'Z'<<8|'W', -1 };
   TestingProfile profile;
   for (size_t i = 0; i < arraysize(ids); ++i) {
     profile.GetPrefs()->SetInteger(prefs::kCountryIDAtInstall, ids[i]);
     ScopedVector<TemplateURL> urls;
-    size_t url_count;
+    size_t default_index;
     TemplateURLPrepopulateData::GetPrepopulatedEngines(
-        profile.GetPrefs(), &(urls.get()), &url_count);
+        profile.GetPrefs(), &(urls.get()), &default_index);
     std::set<int> unique_ids;
     for (size_t turl_i = 0; turl_i < urls.size(); ++turl_i) {
       ASSERT_TRUE(unique_ids.find(urls[turl_i]->prepopulate_id()) ==
                   unique_ids.end());
       unique_ids.insert(urls[turl_i]->prepopulate_id());
     }
   }
 }
 
 // Verifies that default search providers from the preferences file
@@ skipping 22 matching lines @@
   scoped_ptr<PrefService> prefs(new PrefService(new PrefValueStore(
       NULL, new JsonPrefStore(preferences_file,
       ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)),
       NULL, NULL)));
 
   TemplateURLPrepopulateData::RegisterUserPrefs(prefs.get());
 
   int version = TemplateURLPrepopulateData::GetDataVersion(prefs.get());
   EXPECT_EQ(1, version);
 
-  std::vector<TemplateURL*> t_urls;
+  ScopedVector<TemplateURL> t_urls;
   size_t default_index;
   TemplateURLPrepopulateData::GetPrepopulatedEngines(
-      prefs.get(), &t_urls, &default_index);
+      prefs.get(), &(t_urls.get()), &default_index);
 
   ASSERT_EQ(1u, t_urls.size());
   EXPECT_EQ(L"foo", t_urls[0]->short_name());
   EXPECT_EQ(L"fook", t_urls[0]->keyword());
   EXPECT_EQ("foo.com", t_urls[0]->url()->GetHost());
   EXPECT_EQ("foi.com", t_urls[0]->GetFavIconURL().host());
   EXPECT_EQ(1u, t_urls[0]->input_encodings().size());
   EXPECT_EQ(1001, t_urls[0]->prepopulate_id());
 }