Changed typed url sync to no longer modify typed/visit_count.

chrome/browser/history/history_backend.cc

 // Copyright (c) 2011 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 767 matching lines @@
     // bother.
     bool has_indexed = false;
     if (text_database_.get()) {
       // We do not have to make it update the visit database, below, we will
       // create the visit entry with the indexed flag set.
       has_indexed = text_database_->AddPageData(i->url(), url_id, 0,
                                                 i->last_visit(),
                                                 i->title(), string16());
     }
 
-    // Make up a visit to correspond to that page.
-    VisitRow visit_info(url_id, i->last_visit(), 0,
-        PageTransition::LINK | PageTransition::CHAIN_START |
-        PageTransition::CHAIN_END, 0);
-    visit_info.is_indexed = has_indexed;
-    if (!visit_database->AddVisit(&visit_info, visit_source)) {
-      NOTREACHED() << "Adding visit failed.";
-      return;
+    // Sync code manages the visits itself.
+    if (visit_source != SOURCE_SYNCED) {
+      // Make up a visit to correspond to the last visit to the page.
+      VisitRow visit_info(url_id, i->last_visit(), 0,
+                          PageTransition::LINK | PageTransition::CHAIN_START |
+                          PageTransition::CHAIN_END, 0);
+      visit_info.is_indexed = has_indexed;
+      if (!visit_database->AddVisit(&visit_info, visit_source)) {
+        NOTREACHED() << "Adding visit failed.";
+        return;
+      }
+
+      if (visit_info.visit_time < first_recorded_time_)
+        first_recorded_time_ = visit_info.visit_time;
     }
-
-    if (visit_info.visit_time < first_recorded_time_)
-      first_recorded_time_ = visit_info.visit_time;
   }
 
   // Broadcast a notification for typed URLs that have been modified. This
   // will be picked up by the in-memory URL database on the main thread.
   //
   // TODO(brettw) bug 1140015: Add an "add page" notification so the history
   // views can keep in sync.
   BroadcastNotifications(NotificationType::HISTORY_TYPED_URLS_MODIFIED,
                          modified.release());
 
@@ skipping 107 matching lines @@
   return false;
 }
 
 bool HistoryBackend::UpdateURL(URLID id, const history::URLRow& url) {
   if (db_.get())
     return db_->UpdateURLRow(id, url);
   return false;
 }
 
 bool HistoryBackend::AddVisits(const GURL& url,
-                               const std::vector<base::Time>& visits,
+                               const std::vector<VisitInfo>& visits,
                                VisitSource visit_source) {
   if (db_.get()) {
-    for (std::vector<base::Time>::const_iterator visit = visits.begin();
+    for (std::vector<VisitInfo>::const_iterator visit = visits.begin();
          visit != visits.end(); ++visit) {
-      if (!AddPageVisit(url, *visit, 0, 0, visit_source).first) {
+      if (!AddPageVisit(
+              url, visit->first, 0, visit->second, visit_source).first) {
         return false;
       }
     }
     ScheduleCommit();
     return true;
   }
   return false;
 }
 
 bool HistoryBackend::RemoveVisits(const VisitVector& visits) {
@@ skipping 1303 matching lines @@
   return true;
 }
 
 BookmarkService* HistoryBackend::GetBookmarkService() {
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history