predictors: ResourcePrefetchPredictorTables cleanup.

chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 611 matching lines @@
 
 TEST_F(ResourcePrefetchPredictorTablesTest, DeleteSingleDataPoint) {
   TestDeleteSingleDataPoint();
 }
 
 TEST_F(ResourcePrefetchPredictorTablesTest, DeleteAllData) {
   TestDeleteAllData();
 }
 
 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;
   tables_->GetAllData(&url_data, &host_data, &url_redirect_data,
                       &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) {
   TestGetAllData();
 }
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, UpdateData) {
   TestUpdateData();
 }
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteData) {
   TestDeleteData();
 }
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteSingleDataPoint) {
   TestDeleteSingleDataPoint();
 }
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteAllData) {
   TestDeleteAllData();
 }
 
 }  // namespace predictors