A quick fix for TopSitesMigrationTest.Migrate.

This test seems to fail because history.19.sql migrates very old pages, i.e. pages whose last_visit_time is >90 days before now, and our history service filters them out. This change just replaces the time-sensitive values (i.e. 'last_visit_time', 'visit_time', and 'time_slot') with the current time to prevent migrating expired pages.

BUG=none
TEST=TopSitesMigrationTest.Migrate
Review URL: http://codereview.chromium.org/6371001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71588 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/history/top_sites_unittest.cc

@@ -5,6 +5,7 @@
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
@@ -382,6 +383,16 @@ class TopSitesMigrationTest : public TopSitesTest {
                   const FilePath& db_path) {
     std::string sql;
     ASSERT_TRUE(file_util::ReadFileToString(sql_path, &sql));
+
+    // Replace the 'last_visit_time', 'visit_time', 'time_slot' values in this
+    // SQL with the current time.
+    int64 now = base::Time::Now().ToInternalValue();
+    std::vector<std::string> sql_time;
+    sql_time.push_back(StringPrintf("%" PRId64, now));  // last_visit_time
+    sql_time.push_back(StringPrintf("%" PRId64, now));  // visit_time
+    sql_time.push_back(StringPrintf("%" PRId64, now));  // time_slot
+    sql = ReplaceStringPlaceholders(sql, sql_time, NULL);
+
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(db_path));
     ASSERT_TRUE(connection.Execute(sql.c_str()));

chrome/test/data/top_sites/history.19.sql

@@ -3,17 +3,17 @@ CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY,value LONGVARCHAR)
 INSERT INTO "meta" VALUES('version','19');
 INSERT INTO "meta" VALUES('last_compatible_version','16');
 CREATE TABLE urls(id INTEGER PRIMARY KEY,url LONGVARCHAR,title LONGVARCHAR,visit_count INTEGER DEFAULT 0 NOT NULL,typed_count INTEGER DEFAULT 0 NOT NULL,last_visit_time INTEGER NOT NULL,hidden INTEGER DEFAULT 0 NOT NULL,favicon_id INTEGER DEFAULT 0 NOT NULL);
-INSERT INTO "urls" VALUES(1,'http://google.com/','Google',1,1,12931898015280853,0,1);
-INSERT INTO "urls" VALUES(2,'http://www.google.com/','Google',1,0,12931898015280853,0,1);
-INSERT INTO "urls" VALUES(3,'http://www.google.com/blank.html','',1,0,12931898015572853,1,0);
-INSERT INTO "urls" VALUES(4,'http://yahoo.com/','Yahoo!',1,1,12931898025843853,0,2);
-INSERT INTO "urls" VALUES(5,'http://www.yahoo.com/','Yahoo!',1,0,12931898025843853,0,2);
+INSERT INTO "urls" VALUES(1,'http://google.com/','Google',1,1,$1,0,1);
+INSERT INTO "urls" VALUES(2,'http://www.google.com/','Google',1,0,$1,0,1);
+INSERT INTO "urls" VALUES(3,'http://www.google.com/blank.html','',1,0,$1,1,0);
+INSERT INTO "urls" VALUES(4,'http://yahoo.com/','Yahoo!',1,1,$1,0,2);
+INSERT INTO "urls" VALUES(5,'http://www.yahoo.com/','Yahoo!',1,0,$1,0,2);
 CREATE TABLE visits(id INTEGER PRIMARY KEY,url INTEGER NOT NULL,visit_time INTEGER NOT NULL,from_visit INTEGER,transition INTEGER DEFAULT 0 NOT NULL,segment_id INTEGER,is_indexed BOOLEAN);
-INSERT INTO "visits" VALUES(1,1,12931898015280853,0,268435457,1,0);
-INSERT INTO "visits" VALUES(2,2,12931898015280853,1,2684354561,0,1);
-INSERT INTO "visits" VALUES(3,3,12931898015572853,0,805306371,0,0);
-INSERT INTO "visits" VALUES(4,4,12931898025843853,0,268435457,2,0);
-INSERT INTO "visits" VALUES(5,5,12931898025843853,4,2684354561,0,1);
+INSERT INTO "visits" VALUES(1,1,$2,0,268435457,1,0);
+INSERT INTO "visits" VALUES(2,2,$2,1,2684354561,0,1);
+INSERT INTO "visits" VALUES(3,3,$2,0,805306371,0,0);
+INSERT INTO "visits" VALUES(4,4,$2,0,268435457,2,0);
+INSERT INTO "visits" VALUES(5,5,$2,4,2684354561,0,1);
 CREATE TABLE visit_source(id INTEGER PRIMARY KEY,source INTEGER NOT NULL);
 CREATE TABLE keyword_search_terms (keyword_id INTEGER NOT NULL,url_id INTEGER NOT NULL,lower_term LONGVARCHAR NOT NULL,term LONGVARCHAR NOT NULL);
 CREATE TABLE downloads (id INTEGER PRIMARY KEY,full_path LONGVARCHAR NOT NULL,url LONGVARCHAR NOT NULL,start_time INTEGER NOT NULL,received_bytes INTEGER NOT NULL,total_bytes INTEGER NOT NULL,state INTEGER NOT NULL);
@@ -21,8 +21,8 @@ CREATE TABLE segments (id INTEGER PRIMARY KEY,name VARCHAR,url_id INTEGER NON NU
 INSERT INTO "segments" VALUES(1,'http://google.com/',1,-1);
 INSERT INTO "segments" VALUES(2,'http://yahoo.com/',4,-1);
 CREATE TABLE segment_usage (id INTEGER PRIMARY KEY,segment_id INTEGER NOT NULL,time_slot INTEGER NOT NULL,visit_count INTEGER DEFAULT 0 NOT NULL);
-INSERT INTO "segment_usage" VALUES(1,1,12931858800000000,1);
-INSERT INTO "segment_usage" VALUES(2,2,12931858800000000,1);
+INSERT INTO "segment_usage" VALUES(1,1,$3,1);
+INSERT INTO "segment_usage" VALUES(2,2,$3,1);
 CREATE TABLE presentation(url_id INTEGER PRIMARY KEY,pres_index INTEGER NOT NULL);
 CREATE INDEX visits_url_index ON visits (url);
 CREATE INDEX visits_from_index ON visits (from_visit);