predictors: ResourcePrefetchPredictorTables cleanup.

chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc

Index: chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc
index 3babd533b39b22530d8d152dd136ff1f9fda5bde..93d2df07c2b16b0fbaf90f110775749f7d2109c8 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc
+++ b/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc
@@ -629,23 +629,18 @@ TEST_F(ResourcePrefetchPredictorTablesTest, DeleteAllData) {
 }
 
 TEST_F(ResourcePrefetchPredictorTablesTest, DatabaseVersionIsSet) {
-  sql::Connection* db = tables_->DB();
   const int version = ResourcePrefetchPredictorTables::kDatabaseVersion;
-  EXPECT_EQ(version, ResourcePrefetchPredictorTables::GetDatabaseVersion(db));
+  EXPECT_EQ(version, tables_->GetDatabaseVersion());
 }
 
 TEST_F(ResourcePrefetchPredictorTablesTest, DatabaseIsResetWhenIncompatible) {
   const int version = ResourcePrefetchPredictorTables::kDatabaseVersion;
-  sql::Connection* db = tables_->DB();
-  ASSERT_TRUE(
-      ResourcePrefetchPredictorTables::SetDatabaseVersion(db, version + 1));
-  EXPECT_EQ(version + 1,
-            ResourcePrefetchPredictorTables::GetDatabaseVersion(db));
+  ASSERT_TRUE(tables_->SetDatabaseVersion(version + 1));
+  EXPECT_EQ(version + 1, tables_->GetDatabaseVersion());
 
   ReopenDatabase();
 
-  db = tables_->DB();
-  ASSERT_EQ(version, ResourcePrefetchPredictorTables::GetDatabaseVersion(db));
+  ASSERT_EQ(version, tables_->GetDatabaseVersion());
 
   PrefetchDataMap url_data, host_data;
   RedirectDataMap url_redirect_data, host_redirect_data;
@@ -653,6 +648,8 @@ TEST_F(ResourcePrefetchPredictorTablesTest, DatabaseIsResetWhenIncompatible) {
                       &host_redirect_data);
   EXPECT_TRUE(url_data.empty());
   EXPECT_TRUE(host_data.empty());
+  EXPECT_TRUE(url_redirect_data.empty());
+  EXPECT_TRUE(host_redirect_data.empty());
 }
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, GetAllData) {