[sync] Add typed url sync metadata to the history db

components/history/core/browser/in_memory_database.cc

 // Copyright 2014 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 "components/history/core/browser/in_memory_database.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 84 matching lines @@
     sql::Statement visit_count(db_.GetUniqueStatement(
         "SELECT sum(visit_count) FROM urls"));
     if (visit_count.Step()) {
       UMA_HISTOGRAM_COUNTS("History.InMemoryTypedUrlVisitCount",
                            visit_count.ColumnInt(0));
     }
   }
 
   // Insert keyword search related URLs.
   begin_load = base::TimeTicks::Now();
-  if (!db_.Execute(
-      "INSERT OR IGNORE INTO urls SELECT u.id, u.url, u.title, u.visit_count, "
-      "u.typed_count, u.last_visit_time, u.hidden, u.favicon_id "
-      "FROM history.urls u JOIN history.keyword_search_terms kst "
-      "WHERE u.typed_count = 0 AND u.id = kst.url_id")) {
+  if (!db_.Execute("INSERT OR IGNORE INTO urls SELECT u.id, u.url, u.title, "
+                   "u.visit_count, u.typed_count, u.last_visit_time, u.hidden "
+                   "FROM history.urls u JOIN history.keyword_search_terms kst "
+                   "WHERE u.typed_count = 0 AND u.id = kst.url_id")) {
     // Unable to get data from the history database. This is OK, the file may
     // just not exist yet.
   }
   end_load = base::TimeTicks::Now();
   UMA_HISTOGRAM_MEDIUM_TIMES("History.InMemoryDBKeywordURLPopulate",
                              end_load - begin_load);
   UMA_HISTOGRAM_COUNTS("History.InMemoryDBKeywordURLItemCount",
                        db_.GetLastChangeCount());
 
   // Copy search terms to memory.
@@ skipping 22 matching lines @@
   CreateKeywordSearchTermsIndices();
 
   return true;
 }
 
 sql::Connection& InMemoryDatabase::GetDB() {
   return db_;
 }
 
 }  // namespace history