diff options
| -rw-r--r-- | chrome/browser/history/visit_database_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/common/page_transition_types.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc index 1373e83..a646b2c 100644 --- a/chrome/browser/history/visit_database_unittest.cc +++ b/chrome/browser/history/visit_database_unittest.cc @@ -165,8 +165,6 @@ TEST_F(VisitDatabaseTest, Update) { // TODO(brettw) write test for GetMostRecentVisitForURL! -#if defined(OS_WIN) -// TODO(playmobil): Enable on POSIX TEST_F(VisitDatabaseTest, GetVisibleVisitsInRange) { // Add one visit. VisitRow visit_info1(1, Time::Now(), 0, @@ -244,5 +242,4 @@ TEST_F(VisitDatabaseTest, GetVisibleVisitsInRange) { EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4) && IsVisitInfoEqual(results[1], visit_info2)); } -#endif // defined(OS_WIN) } // namespace history diff --git a/chrome/common/page_transition_types.h b/chrome/common/page_transition_types.h index d44bb28..2d30199 100644 --- a/chrome/common/page_transition_types.h +++ b/chrome/common/page_transition_types.h @@ -115,8 +115,7 @@ class PageTransition { static bool ValidType(int32 type) { int32 t = StripQualifier(static_cast<Type>(type)); - return (t >= 0 && t <= LAST_CORE && - (type & ~(QUALIFIER_MASK | CORE_MASK)) == 0); + return (t >= 0 && t <= LAST_CORE); } static Type FromInt(int32 type) { |