Remove deadcode in history backend.

chrome/browser/history/history_backend.cc

 // 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.
 
 #include "chrome/browser/history/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 289 matching lines @@
 
   // Are we at the beginning of a new segment?
   // Note that navigating to an existing entry (with back/forward) reuses the
   // same transition type.  We are not adding it as a new segment in that case
   // because if this was the target of a redirect, we might end up with
   // 2 entries for the same final URL. Ex: User types google.net, gets
   // redirected to google.com. A segment is created for google.net. On
   // google.com users navigates through a link, then press back. That last
   // navigation is for the entry google.com transition typed. We end up adding
   // a segment for that one as well. So we end up with google.net and google.com
-  // in the segement table, showing as 2 entries in the NTP.
+  // in the segment table, showing as 2 entries in the NTP.
   // Note also that we should still be updating the visit count for that segment
   // which we are not doing now. It should be addressed when
   // http://crbug.com/96860 is fixed.
   if ((t == content::PAGE_TRANSITION_TYPED ||
        t == content::PAGE_TRANSITION_AUTO_BOOKMARK) &&
       (transition_type & content::PAGE_TRANSITION_FORWARD_BACK) == 0) {
     // If so, create or get the segment.
     std::string segment_name = db_->ComputeSegmentName(url);
     URLID url_id = db_->GetRowForURL(url, NULL);
     if (!url_id)
@@ skipping 301 matching lines @@
   thumbnail_db_.reset(new ThumbnailDatabase());
   if (!db_->GetNeedsThumbnailMigration()) {
     // No convertion needed - use new filename right away.
     thumbnail_name = GetFaviconsFileName();
   }
   if (thumbnail_db_->Init(thumbnail_name,
                           history_publisher_.get(),
                           db_.get()) != sql::INIT_OK) {
     // Unlike the main database, we don't error out when the database is too
     // new because this error is much less severe. Generally, this shouldn't
-    // happen since the thumbnail and main datbase versions should be in sync.
+    // happen since the thumbnail and main database versions should be in sync.
     // We'll just continue without thumbnails & favicons in this case or any
     // other error.
     LOG(WARNING) << "Could not initialize the thumbnail database.";
     thumbnail_db_.reset();
   }
 
   if (db_->GetNeedsThumbnailMigration()) {
     VLOG(1) << "Starting TopSites migration";
     delegate_->StartTopSitesMigration(id_);
   }
@@ skipping 1247 matching lines @@
       favicon_sizes.erase(favicon_sizes.begin());
     }
     thumbnail_db_->AddFaviconBitmap(favicon_id, bitmap_data, base::Time::Now(),
                                     pixel_size);
     favicon_sizes.push_back(pixel_size);
   }
 
   // A site may have changed the favicons that it uses for |page_url|.
   // Example Scenario:
   //   page_url = news.google.com
-  //   Intial State: www.google.com/favicon.ico 16x16, 32x32
+  //   Initial State: www.google.com/favicon.ico 16x16, 32x32
   //   MergeFavicon(news.google.com, news.google.com/news_specific.ico, ...,
   //                ..., 16x16)
   //
   // Difficulties:
   // 1. Sync requires that a call to GetFaviconsForURL() returns the
   //    |bitmap_data| passed into MergeFavicon().
   //    - It is invalid for the 16x16 bitmap for www.google.com/favicon.ico to
   //      stay mapped to news.google.com because it would be unclear which 16x16
   //      bitmap should be returned via GetFaviconsForURL().
   //
   // 2. www.google.com/favicon.ico may be mapped to more than just
   //    news.google.com (eg www.google.com).
   //    - The 16x16 bitmap cannot be deleted from www.google.com/favicon.ico
   //
   // To resolve these problems, we copy all of the favicon bitmaps previously
   // mapped to news.google.com (|page_url|) and add them to the favicon at
   // news.google.com/news_specific.ico (|icon_url|). The favicon sizes for
   // |icon_url| are set to default to indicate that |icon_url| has incomplete
   // / incorrect data.
-  // Difficlty 1: All but news.google.com/news_specific.ico are unmapped from
+  // Difficulty 1: All but news.google.com/news_specific.ico are unmapped from
   //              news.google.com
   // Difficulty 2: The favicon bitmaps for www.google.com/favicon.ico are not
   //               modified.
 
   std::vector<IconMapping> icon_mappings;
   thumbnail_db_->GetIconMappingsForPageURL(page_url, icon_type, &icon_mappings);
 
   // Copy the favicon bitmaps mapped to |page_url| to the favicon at |icon_url|
   // till the limit of |kMaxFaviconBitmapsPerIconURL| is reached.
   for (size_t i = 0; i < icon_mappings.size(); ++i) {
@@ skipping 893 matching lines @@
   }
 
   // Clear thumbnail and favicon history. The favicons for the given URLs will
   // be kept.
   if (!ClearAllThumbnailHistory(&kept_urls)) {
     LOG(ERROR) << "Thumbnail history could not be cleared";
     // We continue in this error case. If the user wants to delete their
     // history, we should delete as much as we can.
   }
 
-  // ClearAllMainHistory will change the IDs of the URLs in kept_urls. Therfore,
-  // we clear the list afterwards to make sure nobody uses this invalid data.
+  // ClearAllMainHistory will change the IDs of the URLs in kept_urls.
+  // Therefore, we clear the list afterwards to make sure nobody uses this

[sky, 2013/08/20 21:21:45]

Why the wrapping here?

[etienneb, 2013/08/21 03:14:39]

Therfore -> Therefore

And, after the fix, the line is > 80.


On 2013/08/20 21:21:45, sky wrote:

+  // invalid data.
   if (!ClearAllMainHistory(kept_urls))
     LOG(ERROR) << "Main history could not be cleared";
   kept_urls.clear();
 
   // Delete archived history.
   if (archived_db_) {
     // Close the database and delete the file.
     archived_db_.reset();
     base::FilePath archived_file_name = GetArchivedFileName();
     sql::Connection::Delete(archived_file_name);
 
     // Now re-initialize the database (which may fail).
     archived_db_.reset(new ArchivedDatabase());
     if (!archived_db_->Init(archived_file_name)) {
       LOG(WARNING) << "Could not initialize the archived database.";
       archived_db_.reset();
     } else {
       // Open our long-running transaction on this database.
       archived_db_->BeginTransaction();
     }
   }
 
   db_->GetStartDate(&first_recorded_time_);
 
-  // Send out the notfication that history is cleared. The in-memory datdabase
+  // Send out the notification that history is cleared. The in-memory database
   // will pick this up and clear itself.
   URLsDeletedDetails* details = new URLsDeletedDetails;
   details->all_history = true;
   NotifySyncURLsDeleted(true, false, NULL);
   BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_DELETED, details);
 }
 
 bool HistoryBackend::ClearAllThumbnailHistory(URLRows* kept_urls) {
   if (!thumbnail_db_) {
     // When we have no reference to the thumbnail database, maybe there was an
@@ skipping 27 matching lines @@
       FaviconMap::const_iterator found = copied_favicons.find(old_id);
       if (found == copied_favicons.end()) {
         new_id = thumbnail_db_->CopyFaviconAndFaviconBitmapsToTemporaryTables(
             old_id);
         copied_favicons[old_id] = new_id;
       } else {
         // We already encountered a URL that used this favicon, use the ID we
         // previously got.
         new_id = found->second;
       }
-      // Add Icon mapping, and we don't care wheteher it suceeded or not.
+      // Add Icon mapping, and we don't care whether it succeeded or not.
       thumbnail_db_->AddToTemporaryIconMappingTable(i->url(), new_id);
     }
   }
 #if defined(OS_ANDROID)
   // TODO (michaelbai): Add the unit test once AndroidProviderBackend is
   // avaliable in HistoryBackend.
   db_->ClearAndroidURLRows();
 #endif
 
   // Drop original favicon_bitmaps, favicons, and icon mapping tables and
@@ skipping 11 matching lines @@
   thumbnail_db_->Vacuum();
   thumbnail_db_->BeginTransaction();
   return true;
 }
 
 bool HistoryBackend::ClearAllMainHistory(const URLRows& kept_urls) {
   // Create the duplicate URL table. We will copy the kept URLs into this.
   if (!db_->CreateTemporaryURLTable())
     return false;
 
-  // Insert the URLs into the temporary table, we need to keep a map of changed
-  // IDs since the ID will be different in the new table.
-  typedef std::map<URLID, URLID> URLIDMap;
-  URLIDMap old_to_new;  // Maps original ID to new one.
+  // Insert the URLs into the temporary table.
   for (URLRows::const_iterator i = kept_urls.begin(); i != kept_urls.end();
        ++i) {
-    URLID new_id = db_->AddTemporaryURL(*i);
-    old_to_new[i->id()] = new_id;
+    db_->AddTemporaryURL(*i);
   }
 
   // Replace the original URL table with the temporary one.
   if (!db_->CommitTemporaryURLTable())
     return false;
 
   // Delete the old tables and recreate them empty.
   db_->RecreateAllTablesButURL();
 
   // Vacuum to reclaim the space from the dropped tables. This must be done
@@ skipping 42 matching lines @@
   int rank = kPageVisitStatsMaxTopSites;
   std::map<GURL, int>::const_iterator it = most_visited_urls_map_.find(url);
   if (it != most_visited_urls_map_.end())
     rank = (*it).second;
   UMA_HISTOGRAM_ENUMERATION("History.TopSitesVisitsByRank",
                             rank, kPageVisitStatsMaxTopSites + 1);
 }
 #endif
 
 }  // namespace history