Some fixes split off from https://chromiumcodereview.appspot.com/9570064/ to try and make the omnib…

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 <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 776 matching lines @@
     URLRow existing_url;
     URLID url_id = url_database->GetRowForURL(i->url(), &existing_url);
     if (!url_id) {
       // Add the page if it doesn't exist.
       url_id = url_database->AddURL(*i);
       if (!url_id) {
         NOTREACHED() << "Could not add row to DB";
         return;
       }
 
-      if (i->typed_count() > 0)
+      if (i->typed_count() > 0) {
         modified->changed_urls.push_back(*i);
+        modified->changed_urls.back().set_id(url_id);  // *i likely has |id_| 0.
+      }
     }
 
     // Add the page to the full text index. This function is also used for
     // importing. Even though we don't have page contents, we can at least
     // add the title and URL to the index so they can be searched. We don't
     // bother to delete any already-existing FTS entries for the URL, since
     // this is normally called on import.
     //
     // If you ever import *after* first run (selecting import from the menu),
     // then these additional entries will "shadow" the originals when querying
@@ skipping 1500 matching lines @@
         break;
       }
     }
   }
   UMA_HISTOGRAM_TIMES("History.GetFavIconFromDB",  // historical name
                       TimeTicks::Now() - beginning_time);
   return success;
 }
 
 }  // namespace history