Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: chrome/browser/autocomplete/in_memory_url_index_unittest.cc

Issue 1513043002: clang/win: Let remaining chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/importer/ie_importer_browsertest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/in_memory_url_index_unittest.cc
diff --git a/chrome/browser/autocomplete/in_memory_url_index_unittest.cc b/chrome/browser/autocomplete/in_memory_url_index_unittest.cc
index f350b44f4277a786656aec0deb9d212e46e8fb35..087b35086e60392738d50e8f5b05b0f5421669e7 100644
--- a/chrome/browser/autocomplete/in_memory_url_index_unittest.cc
+++ b/chrome/browser/autocomplete/in_memory_url_index_unittest.cc
@@ -1031,10 +1031,10 @@ TEST_F(InMemoryURLIndexTest, ReadVisitsFromHistory) {
ASSERT_TRUE(entry != history_info_map.end());
{
const VisitInfoVector& visits = entry->second.visits;
- EXPECT_EQ(3u, visits.size());
- EXPECT_EQ(0u, visits[0].second);
- EXPECT_EQ(1u, visits[1].second);
- EXPECT_EQ(0u, visits[2].second);
+ ASSERT_EQ(3u, visits.size());
+ EXPECT_EQ(static_cast<ui::PageTransition>(0u), visits[0].second);
+ EXPECT_EQ(static_cast<ui::PageTransition>(1u), visits[1].second);
+ EXPECT_EQ(static_cast<ui::PageTransition>(0u), visits[2].second);
}
// Ditto but for URL with id 35.
@@ -1042,9 +1042,9 @@ TEST_F(InMemoryURLIndexTest, ReadVisitsFromHistory) {
ASSERT_TRUE(entry != history_info_map.end());
{
const VisitInfoVector& visits = entry->second.visits;
- EXPECT_EQ(2u, visits.size());
- EXPECT_EQ(1u, visits[0].second);
- EXPECT_EQ(1u, visits[1].second);
+ ASSERT_EQ(2u, visits.size());
+ EXPECT_EQ(static_cast<ui::PageTransition>(1u), visits[0].second);
+ EXPECT_EQ(static_cast<ui::PageTransition>(1u), visits[1].second);
}
// The URL with id 32 has many visits listed in the database, but we
@@ -1055,7 +1055,7 @@ TEST_F(InMemoryURLIndexTest, ReadVisitsFromHistory) {
const VisitInfoVector& visits = entry->second.visits;
EXPECT_EQ(10u, visits.size());
for (size_t i = 0; i < visits.size(); ++i)
- EXPECT_EQ(0u, visits[i].second);
+ EXPECT_EQ(static_cast<ui::PageTransition>(0u), visits[i].second);
}
}
« no previous file with comments | « no previous file | chrome/browser/importer/ie_importer_browsertest_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698