Make HistoryDatabase own StarredURLDatabase instead of inheriting from it.

chrome/browser/history/history_database.h

Index: chrome/browser/history/history_database.h
diff --git a/chrome/browser/history/history_database.h b/chrome/browser/history/history_database.h
index f027ebb85f42f8e2946ebcbff1345facb1c16e0a..70f3693b4dce2388fe74e6d888a0dfd28fcb1711 100644
--- a/chrome/browser/history/history_database.h
+++ b/chrome/browser/history/history_database.h
@@ -6,11 +6,12 @@
 #define CHROME_BROWSER_HISTORY_HISTORY_DATABASE_H_
 #pragma once
 
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/history/download_database.h"
 #include "chrome/browser/history/history_types.h"
-#include "chrome/browser/history/starred_url_database.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/history/visit_database.h"
 #include "chrome/browser/history/visitsegment_database.h"
@@ -30,10 +31,7 @@ namespace history {
 // as the storage interface. Logic for manipulating this storage layer should
 // be in HistoryBackend.cc.
 class HistoryDatabase : public DownloadDatabase,
-  // TODO(sky): See if we can nuke StarredURLDatabase and just create on the
-  // stack for migration. Then HistoryDatabase would directly descend from
-  // URLDatabase.
-                        public StarredURLDatabase,
+                        public URLDatabase,
                         public VisitDatabase,
                         public VisitSegmentDatabase {
  public:
@@ -145,8 +143,8 @@ class HistoryDatabase : public DownloadDatabase,
  private:
   FRIEND_TEST_ALL_PREFIXES(IconMappingMigrationTest, TestIconMappingMigration);
 
-  // Implemented for URLDatabase.
-  virtual sql::Connection& GetDB();
+  // Overridden from URLDatabase:
+  virtual sql::Connection& GetDB() OVERRIDE;
 
   // Migration -----------------------------------------------------------------