1 files changed, 6 insertions, 8 deletions
diff --git a/src/trace_processor/storage_table.h b/src/trace_processor/storage_table.h
index 74247f602..3afe5cea7 100644
--- a/src/trace_processor/storage_table.h
+++ b/src/trace_processor/storage_table.h
@@ -18,25 +18,25 @@
 #include <set>
 
 #include "src/trace_processor/row_iterators.h"
-#include "src/trace_processor/sqlite/sqlite_table.h"
 #include "src/trace_processor/storage_columns.h"
 #include "src/trace_processor/storage_schema.h"
+#include "src/trace_processor/table.h"
 
 namespace perfetto {
 namespace trace_processor {
 
 // Base class for all table implementations which are backed by some data
 // storage.
-class StorageTable : public SqliteTable {
+class StorageTable : public Table {
  public:
   // A cursor which abstracts common patterns found in storage backed tables. It
   // takes a strategy to iterate through rows and a column reporter for each
   // column to implement the Cursor interface.
-  class Cursor final : public SqliteTable::Cursor {
+  class Cursor final : public Table::Cursor {
    public:
     Cursor(StorageTable* table);
 
-    // Implementation of SqliteTable::Cursor.
+    // Implementation of Table::Cursor.
     int Filter(const QueryConstraints& qc, sqlite3_value** argv) override;
     int Next() override;
     int Eof() override;
@@ -52,10 +52,8 @@ class StorageTable : public SqliteTable {
   virtual ~StorageTable() override;
 
   // Table implementation.
-  util::Status Init(int,
-                    const char* const*,
-                    SqliteTable::Schema*) override final;
-  std::unique_ptr<SqliteTable::Cursor> CreateCursor() override;
+  base::Optional<Table::Schema> Init(int, const char* const*) override final;
+  std::unique_ptr<Table::Cursor> CreateCursor() override;
 
   // Required methods for subclasses to implement.
   virtual StorageSchema CreateStorageSchema() = 0;