Now does not sync URLs that only have imported visits.

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 682 matching lines @@
                          history::SOURCE_SYNCED);
 
   // Fetch the row information about the url from history db.
   VisitVector visits;
   URLID row_id = backend_->db_->GetRowForURL(url, NULL);
   backend_->db_->GetVisitsForURL(row_id, &visits);
 
   // Check if all the visits to the url are stored in database.
   ASSERT_EQ(3U, visits.size());
   VisitSourceMap visit_sources;
-  backend_->db_->GetVisitsSource(visits, &visit_sources);
+  ASSERT_TRUE(backend_->GetVisitsSource(visits, &visit_sources));
   ASSERT_EQ(3U, visit_sources.size());
   int sources = 0;
   for (int i = 0; i < 3; i++) {
     switch (visit_sources[visits[i].visit_id]) {
       case history::SOURCE_EXTENSION:
         sources |= 0x1;
         break;
       case history::SOURCE_FIREFOX_IMPORTED:
         sources |= 0x2;
         break;
@@ skipping 33 matching lines @@
                              history::SOURCE_BROWSED, false));
   backend_->AddPage(request3);
 
   // Three visits should be added with proper sources.
   VisitVector visits;
   URLRow row;
   URLID id = backend_->db()->GetRowForURL(url, &row);
   ASSERT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
   ASSERT_EQ(3U, visits.size());
   VisitSourceMap visit_sources;
-  backend_->db_->GetVisitsSource(visits, &visit_sources);
+  ASSERT_TRUE(backend_->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<VisitInfo> visits1, visits2;
   visits1.push_back(VisitInfo(
@@ skipping 18 matching lines @@
   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;
   URLRow row;
   URLID id = backend_->db()->GetRowForURL(url1, &row);
   ASSERT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
   ASSERT_EQ(3U, visits.size());
   VisitSourceMap visit_sources;
-  backend_->db_->GetVisitsSource(visits, &visit_sources);
+  ASSERT_TRUE(backend_->GetVisitsSource(visits, &visit_sources));
   ASSERT_EQ(3U, visit_sources.size());
   for (int i = 0; i < 3; i++)
     EXPECT_EQ(history::SOURCE_IE_IMPORTED, visit_sources[visits[i].visit_id]);
   id = backend_->db()->GetRowForURL(url2, &row);
   ASSERT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
   ASSERT_EQ(2U, visits.size());
-  backend_->db_->GetVisitsSource(visits, &visit_sources);
+  ASSERT_TRUE(backend_->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, GetMostRecentVisits) {
   ASSERT_TRUE(backend_.get());
 
   GURL url1("http://www.cnn.com");
   std::vector<VisitInfo> visits1;
@@ skipping 104 matching lines @@
   VisitVector visits;
   URLRow row;
   URLID id = backend_->db()->GetRowForURL(url1, &row);
   ASSERT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
   ASSERT_EQ(2U, visits.size());
   // Remove these visits.
   ASSERT_TRUE(backend_->RemoveVisits(visits));
 
   // Now check only url2's source in visit_source table.
   VisitSourceMap visit_sources;
-  backend_->db_->GetVisitsSource(visits, &visit_sources);
+  ASSERT_TRUE(backend_->GetVisitsSource(visits, &visit_sources));
   ASSERT_EQ(0U, visit_sources.size());
   id = backend_->db()->GetRowForURL(url2, &row);
   ASSERT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
   ASSERT_EQ(2U, visits.size());
-  backend_->db_->GetVisitsSource(visits, &visit_sources);
+  ASSERT_TRUE(backend_->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 for migration of adding visit_source table.
 TEST_F(HistoryBackendTest, MigrationVisitSource) {
   ASSERT_TRUE(backend_.get());
   backend_->Closing();
   backend_ = NULL;
@@ skipping 184 matching lines @@
   ASSERT_TRUE(backend_->GetFaviconFromDB(url, TOUCH_ICON, &favicon));
   std::string touchicon_data(
       favicon.image_data->front(),
       favicon.image_data->front() + favicon.image_data->size());
 
   EXPECT_EQ(TOUCH_ICON, favicon.icon_type);
   EXPECT_EQ(icon_url, favicon.icon_url);
   EXPECT_EQ(blob_data, touchicon_data);
 }
 }  // namespace history