FBTF: More ctor/dtor cleanup.

chrome/browser/history/top_sites.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 "chrome/browser/history/top_sites.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 261 matching lines @@
   }
   return -1;
 }
 
 bool TopSites::AddPrepopulatedPages(MostVisitedURLList* urls) {
   // TODO(arv): This needs to get the data from some configurable place.
   // http://crbug.com/17630
   bool added = false;
   GURL welcome_url(l10n_util::GetStringUTF8(IDS_CHROME_WELCOME_URL));
   if (urls->size() < kTopSitesNumber && IndexOf(*urls, welcome_url) == -1) {
-    MostVisitedURL url = {
-      welcome_url,
-      GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON"),
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE)
-    };
+    MostVisitedURL url(
+        welcome_url,
+        GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON"),
+        l10n_util::GetStringUTF16(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE));
     url.redirects.push_back(welcome_url);
     urls->push_back(url);
     added = true;
   }
 
   GURL themes_url(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL));
   if (urls->size() < kTopSitesNumber && IndexOf(*urls, themes_url) == -1) {
-    MostVisitedURL url = {
-      themes_url,
-      GURL("chrome://theme/IDR_NEWTAB_THEMES_GALLERY_FAVICON"),
-      l10n_util::GetStringUTF16(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE)
-    };
+    MostVisitedURL url(
+        themes_url,
+        GURL("chrome://theme/IDR_NEWTAB_THEMES_GALLERY_FAVICON"),
+        l10n_util::GetStringUTF16(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE));
     url.redirects.push_back(themes_url);
     urls->push_back(url);
     added = true;
   }
 
   return added;
 }
 
 void TopSites::MigratePinnedURLs() {
   std::map<GURL, size_t> tmp_map;
@@ skipping 579 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   db_.reset(new TopSitesDatabaseImpl());
   file_util::Delete(db_path_, false);
   if (!db_->Init(db_path_)) {
     NOTREACHED() << "Failed to initialize database.";
     return;
   }
 }
 
 }  // namespace history