FBTF: More ctor/dtor cleanup.

chrome/browser/history/top_sites_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 "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 400 matching lines @@
   // the same score on the redirect destination, which in turn should not
   // be replaced by the source again.
   EXPECT_TRUE(top_sites().SetPageThumbnail(url1a, thumbnail, medium_score));
   EXPECT_TRUE(top_sites().SetPageThumbnail(url1b, thumbnail, medium_score));
   EXPECT_FALSE(top_sites().SetPageThumbnail(url1a, thumbnail, medium_score));
 }
 
 TEST_F(TopSitesTest, GetPageThumbnail) {
   BrowserThread db_loop(BrowserThread::DB, MessageLoop::current());
   MostVisitedURLList url_list;
-  MostVisitedURL url1 = {GURL("http://asdf.com")};
+  MostVisitedURL url1(GURL("http://asdf.com"), GURL(), string16());
   url1.redirects.push_back(url1.url);
   url_list.push_back(url1);
 
-  MostVisitedURL url2 = {GURL("http://gmail.com")};
+  MostVisitedURL url2(GURL("http://gmail.com"), GURL(), string16());
   url2.redirects.push_back(url2.url);
   url2.redirects.push_back(GURL("http://mail.google.com"));
   url_list.push_back(url2);
 
   top_sites().UpdateMostVisited(url_list);
   MessageLoop::current()->RunAllPending();
 
   // Create a dummy thumbnail.
   SkBitmap thumbnail;
   thumbnail.setConfig(SkBitmap::kARGB_8888_Config, 4, 4);
@@ skipping 883 matching lines @@
 
 TEST_F(TopSitesTest, AddPrepopulatedPages) {
   MostVisitedURLList pages;
   top_sites().AddPrepopulatedPages(&pages);
   ASSERT_EQ(2u, pages.size());
   EXPECT_EQ(welcome_url(), pages[0].url);
   EXPECT_EQ(themes_url(), pages[1].url);
 
   pages.clear();
 
-  MostVisitedURL url = {themes_url()};
+  MostVisitedURL url(themes_url(), GURL(), string16());
   pages.push_back(url);
 
   top_sites().AddPrepopulatedPages(&pages);
 
   // Themes URL is already in pages; should not be added twice.
   ASSERT_EQ(2u, pages.size());
   EXPECT_EQ(themes_url(), pages[0].url);
   EXPECT_EQ(welcome_url(), pages[1].url);
 }
 
 }  // namespace history