| Index: chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| index 24f54947e58b82dad5f53433cb8643ad58f715ed..106c72fecc0f77eb44600a46152bf1edd651b610 100644
|
| --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
|
| @@ -68,12 +68,15 @@ const char* FullStreamUIPolicy::kTableFieldTypes[] = {
|
| "LONGVARCHAR NOT NULL", "INTEGER", "INTEGER", "LONGVARCHAR", "LONGVARCHAR",
|
| "LONGVARCHAR", "LONGVARCHAR", "LONGVARCHAR", "LONGVARCHAR"
|
| };
|
| -const int FullStreamUIPolicy::kTableFieldCount = arraysize(kTableContentFields);
|
| +const int FullStreamUIPolicy::kTableFieldCount =
|
| + arraysize(FullStreamUIPolicy::kTableContentFields);
|
|
|
| FullStreamUIPolicy::FullStreamUIPolicy(Profile* profile)
|
| : ActivityLogDatabasePolicy(
|
| profile,
|
| - FilePath(chrome::kExtensionActivityLogFilename)) {}
|
| + FilePath(chrome::kExtensionActivityLogFilename)),
|
| + string_table_("string_ids"),
|
| + url_table_("url_ids") {}
|
|
|
| FullStreamUIPolicy::~FullStreamUIPolicy() {}
|
|
|
| @@ -90,6 +93,11 @@ bool FullStreamUIPolicy::InitDatabase(sql::Connection* db) {
|
| }
|
| }
|
|
|
| + if (!string_table_.Initialize(db))
|
| + return false;
|
| + if (!url_table_.Initialize(db))
|
| + return false;
|
| +
|
| // Create the unified activity log entry table.
|
| return ActivityDatabase::InitializeTable(db,
|
| kTableName,
|
| @@ -113,6 +121,7 @@ bool FullStreamUIPolicy::FlushDatabase(sql::Connection* db) {
|
| sql::Statement statement(db->GetCachedStatement(
|
| sql::StatementID(SQL_FROM_HERE), sql_str.c_str()));
|
|
|
| + // TODO(mvrable): Should be moved to a utility function, perhaps.
|
| url_canon::Replacements<char> url_sanitizer;
|
| if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableExtensionActivityLogTesting)) {
|
|
|