Misc. warning fixes/cleanup

sql/test/test_helpers.cc

Index: sql/test/test_helpers.cc
diff --git a/sql/test/test_helpers.cc b/sql/test/test_helpers.cc
index 8b202562d6407baa42c19702e7e302f02d7880d3..72d42c6afc26a9a7c905bc2e780d1cbb1eb00fe1 100644
--- a/sql/test/test_helpers.cc
+++ b/sql/test/test_helpers.cc
@@ -92,7 +92,8 @@ bool CorruptSizeInHeader(const base::FilePath& db_path) {
   const unsigned page_size = ReadBigEndian(header + kPageSizeOffset, 2);
 
   // One larger than the expected size.
-  const unsigned page_count = (db_size + page_size) / page_size;
+  const unsigned page_count =
+      static_cast<unsigned>((db_size + page_size) / page_size);
   WriteBigEndian(page_count, header + kPageCountOffset, 4);
 
   // Update change count so outstanding readers know the info changed.
@@ -212,7 +213,7 @@ bool CountTableRows(sql::Connection* db, const char* table, size_t* count) {
   if (!s.Step())
     return false;
 
-  *count = s.ColumnInt64(0);
+  *count = static_cast<size_t>(s.ColumnInt64(0));
   return true;
 }