Make HistoryDatabase own StarredURLDatabase instead of inheriting from it.

chrome/browser/history/starred_url_database_unittest.cc

Index: chrome/browser/history/starred_url_database_unittest.cc
diff --git a/chrome/browser/history/starred_url_database_unittest.cc b/chrome/browser/history/starred_url_database_unittest.cc
index fd18ea39cec7a6505597dfccf775ec13dd57a360..65ac62e48e1e92e2e1ace9758f339df3392a45d3 100644
--- a/chrome/browser/history/starred_url_database_unittest.cc
+++ b/chrome/browser/history/starred_url_database_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ -19,7 +20,8 @@ namespace history {
 class StarredURLDatabaseTest : public testing::Test,
                                public StarredURLDatabase {
  public:
-  StarredURLDatabaseTest() {
+  StarredURLDatabaseTest()
+      : StarredURLDatabase(&db_) {
   }
 
   void AddPage(const GURL& url) {
@@ -65,7 +67,7 @@ class StarredURLDatabaseTest : public testing::Test,
 
  private:
   // Test setup.
-  void SetUp() {
+  virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     db_file_ = temp_dir_.path().AppendASCII("VisitTest.db");
     file_util::Delete(db_file_, false);
@@ -85,15 +87,10 @@ class StarredURLDatabaseTest : public testing::Test,
     CreateMainURLIndex();
     EnsureStarredIntegrity();
   }
-  void TearDown() {
+  virtual void TearDown() OVERRIDE {
     db_.Close();
   }
 
-  // Provided for URL/StarredURLDatabase.
-  virtual sql::Connection& GetDB() {
-    return db_;
-  }
-
   ScopedTempDir temp_dir_;
   FilePath db_file_;
   sql::Connection db_;