diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 00:48:24 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-08 00:48:24 +0000 |
| commit | 20d08228331d4e4a1196500f3ac0f16144d6848b (patch) | |
| tree | 27bd1f141d2049be680a8d3fa435f07f33fef04d | |
| parent | da86162256f79ad2e744edfe6bb9c4758031f3c3 (diff) | |
| download | chromium_src-20d08228331d4e4a1196500f3ac0f16144d6848b.zip chromium_src-20d08228331d4e4a1196500f3ac0f16144d6848b.tar.gz chromium_src-20d08228331d4e4a1196500f3ac0f16144d6848b.tar.bz2 | |
Merge 166292 - Fix VisitFilterTest.GetVisitScore so it doesn't fail during DST transitions.
Changed the test to use a fixed date instead of the current day.
BUG=159384
Review URL: https://chromiumcodereview.appspot.com/11369086
TBR=rfevang@chromium.org
Review URL: https://codereview.chromium.org/11360141
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166564 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/history/visit_filter_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/history/visit_filter_unittest.cc b/chrome/browser/history/visit_filter_unittest.cc index 0a8fd57..a3f5aef 100644 --- a/chrome/browser/history/visit_filter_unittest.cc +++ b/chrome/browser/history/visit_filter_unittest.cc @@ -239,9 +239,10 @@ TEST_F(VisitFilterTest, IntersectTimeVectors) { EXPECT_TRUE(result.empty()); } -// Disabled because this test is not DST-safe. http://crbug.com/159384 -TEST_F(VisitFilterTest, DISABLED_GetVisitScore) { - base::Time filter_time = GetClosestMidday(); +TEST_F(VisitFilterTest, GetVisitScore) { + base::Time filter_time; + ASSERT_TRUE(base::Time::FromString("Tue, 24 Apr 2012, 12:00:00", + &filter_time)); VisitFilter filter; VisitRow visit; |