Remove deadcode in history backend.

chrome/browser/history/history_backend.cc

Index: chrome/browser/history/history_backend.cc
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 4e69a4bf9a666564457bf646e6814bda9bb01c89..0b6aabb2171e217c85e7a1f06673694538d0aeab 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -307,7 +307,7 @@ SegmentID HistoryBackend::UpdateSegments(
   // 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.
@@ -629,7 +629,7 @@ void HistoryBackend::InitImpl(const std::string& languages) {
                           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.";
@@ -1897,7 +1897,7 @@ void HistoryBackend::MergeFavicon(
   // 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)
   //
@@ -1917,7 +1917,7 @@ void HistoryBackend::MergeFavicon(
   // 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.
@@ -2831,8 +2831,9 @@ void HistoryBackend::DeleteAllHistory() {
     // 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();
@@ -2857,7 +2858,7 @@ void HistoryBackend::DeleteAllHistory() {
 
   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;
@@ -2905,7 +2906,7 @@ bool HistoryBackend::ClearAllThumbnailHistory(URLRows* kept_urls) {
         // 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);
     }
   }
@@ -2937,14 +2938,10 @@ bool HistoryBackend::ClearAllMainHistory(const URLRows& kept_urls) {
   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.