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

chrome/browser/history/history_backend_unittest.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 <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 678 matching lines @@
   VisitSourceMap visit_sources;
   backend_->db_->GetVisitsSource(visits, &visit_sources);
   ASSERT_EQ(1U, visit_sources.size());
   EXPECT_EQ(history::SOURCE_SYNCED, visit_sources.begin()->second);
 }
 
 TEST_F(HistoryBackendTest, AddVisitsSource) {
   ASSERT_TRUE(backend_.get());
 
   GURL url1("http://www.cnn.com");
-  std::vector<base::Time> visits1;
-  visits1.push_back(Time::Now() - base::TimeDelta::FromDays(5));
-  visits1.push_back(Time::Now() - base::TimeDelta::FromDays(1));
-  visits1.push_back(Time::Now());
+  std::vector<std::pair<base::Time, PageTransition::Type> > visits1, visits2;
+  visits1.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now() - base::TimeDelta::FromDays(5), PageTransition::LINK));
+  visits1.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now() - base::TimeDelta::FromDays(1), PageTransition::LINK));
+  visits1.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now(), PageTransition::LINK));
 
   GURL url2("http://www.example.com");
-  std::vector<base::Time> visits2;
-  visits2.push_back(Time::Now() - base::TimeDelta::FromDays(10));
-  visits2.push_back(Time::Now());
+  visits2.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now() - base::TimeDelta::FromDays(10), PageTransition::LINK));
+  visits2.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now(), PageTransition::LINK));
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   // Add the visits.
   backend_->AddVisits(url1, visits1, history::SOURCE_IE_IMPORTED);
   backend_->AddVisits(url2, visits2, history::SOURCE_SYNCED);
 
   // Verify the visits were added with their sources.
   VisitVector visits;
@@ skipping 12 matching lines @@
   backend_->db_->GetVisitsSource(visits, &visit_sources);
   ASSERT_EQ(2U, visit_sources.size());
   for (int i = 0; i < 2; i++)
     EXPECT_EQ(history::SOURCE_SYNCED, visit_sources[visits[i].visit_id]);
 }
 
 TEST_F(HistoryBackendTest, RemoveVisitsSource) {
   ASSERT_TRUE(backend_.get());
 
   GURL url1("http://www.cnn.com");
-  std::vector<base::Time> visits1;
-  visits1.push_back(Time::Now() - base::TimeDelta::FromDays(5));
-  visits1.push_back(Time::Now());
+  std::vector<std::pair<base::Time, PageTransition::Type> > visits1, visits2;
+  visits1.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now() - base::TimeDelta::FromDays(5), PageTransition::LINK));
+  visits1.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now(), PageTransition::LINK));
 
   GURL url2("http://www.example.com");
-  std::vector<base::Time> visits2;
-  visits2.push_back(Time::Now() - base::TimeDelta::FromDays(10));
-  visits2.push_back(Time::Now());
+  visits2.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now() - base::TimeDelta::FromDays(10), PageTransition::LINK));
+  visits2.push_back(std::pair<base::Time, PageTransition::Type>(
+      Time::Now(), PageTransition::LINK));
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   // Add the visits.
   backend_->AddVisits(url1, visits1, history::SOURCE_IE_IMPORTED);
   backend_->AddVisits(url2, visits2, history::SOURCE_SYNCED);
 
   // Verify the visits of url1 were added.
   VisitVector visits;
@@ skipping 164 matching lines @@
       url, icon_id, FAVICON, &replaced));
   EXPECT_EQ(0, replaced);
 
   std::vector<IconMapping> icon_mapping;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       url, &icon_mapping));
   EXPECT_EQ(1u, icon_mapping.size());
 }
 
 }  // namespace history