Access Context Auditing: Inline table names into queries

CL stops appending table names into queries and inlines them directly
instead.

Bug: 1117381
Change-Id: I4cb5adc389f1685606ffa519383493a594e6bfac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485061Reviewed-by: Martin Šrámek <msramek@chromium.org>
Commit-Queue: Theodore Olsauskas-Warren <sauski@google.com>
Cr-Commit-Position: refs/heads/master@{#819261}

chrome/browser/browsing_data/access_context_audit_database.cc

@@ -19,8 +19,6 @@ namespace {
 
 const base::FilePath::CharType kDatabaseName[] =
     FILE_PATH_LITERAL("AccessContextAudit");
-const char kCookieTableName[] = "cookies";
-const char kStorageAPITableName[] = "originStorageAPIs";
 static const int kVersionNumber = 1;
 
 // Callback that is fired upon an SQLite error, razes the database if the error
@@ -54,10 +52,9 @@ void DatabaseErrorCallback(sql::Database* db,
 // Returns true if a cookie table already exists in |db|, but is missing the
 // is_persistent field.
 bool CookieTableMissingIsPersistent(sql::Database* db) {
-  std::string select = "SELECT sql FROM sqlite_master WHERE name = '";
-  select.append(kCookieTableName);
-  select.append("' AND type = 'table'");
-  sql::Statement statement(db->GetUniqueStatement(select.c_str()));
+  const char kSelectCookieTable[] =
+      "SELECT sql FROM sqlite_master WHERE name = 'cookies' AND type = 'table'";
+  sql::Statement statement(db->GetUniqueStatement(kSelectCookieTable));
 
   // Unable to step implies cookies table does not exist.
   if (!statement.Step())
@@ -69,10 +66,9 @@ bool CookieTableMissingIsPersistent(sql::Database* db) {
 
 // Removes all cookie records in |db| with is_persistent = false.
 bool DeleteNonPersistentCookies(sql::Database* db) {
-  std::string remove = "DELETE FROM ";
-  remove.append(kCookieTableName);
-  remove.append(" WHERE is_persistent != 1");
-  return db->Execute(remove.c_str());
+  const char kRemoveNonPersistent[] =
+      "DELETE FROM cookies WHERE is_persistent != 1";
+  return db->Execute(kRemoveNonPersistent);
 }
 
 bool IsContentSettingSessionOnly(
@@ -192,38 +188,33 @@ bool AccessContextAuditDatabase::InitializeSchema() {
     // Simply remove the table in this case. Due to a flag misconfiguration this
     // version of the table was pushed to all canary users for a short period.
     // TODO(crbug.com/1102006): Remove this code before M86 branch point.
-    std::string drop_table = "DROP TABLE ";
-    drop_table.append(kCookieTableName);
-    if (!db_.Execute(drop_table.c_str()))
+    const char kDropCookiesTable[] = "DROP TABLE cookies";
+    if (!db_.Execute(kDropCookiesTable))
       return false;
   }
 
-  std::string create_table;
-  create_table.append("CREATE TABLE IF NOT EXISTS ");
-  create_table.append(kCookieTableName);
-  create_table.append(
+  const char kCreateCookiesTable[] =
+      "CREATE TABLE IF NOT EXISTS cookies "
       "(top_frame_origin TEXT NOT NULL,"
       "name TEXT NOT NULL,"
       "domain TEXT NOT NULL,"
       "path TEXT NOT NULL,"
       "access_utc INTEGER NOT NULL,"
       "is_persistent INTEGER NOT NULL,"
-      "PRIMARY KEY (top_frame_origin, name, domain, path))");
+      "PRIMARY KEY (top_frame_origin, name, domain, path))";
 
-  if (!db_.Execute(create_table.c_str()))
+  if (!db_.Execute(kCreateCookiesTable))
     return false;
 
-  create_table.clear();
-  create_table.append("CREATE TABLE IF NOT EXISTS ");
-  create_table.append(kStorageAPITableName);
-  create_table.append(
+  const char kCreateStorageApiTable[] =
+      "CREATE TABLE IF NOT EXISTS originStorageAPIs"
       "(top_frame_origin TEXT NOT NULL,"
       "type INTEGER NOT NULL,"
       "origin TEXT NOT NULL,"
       "access_utc INTEGER NOT NULL,"
-      "PRIMARY KEY (top_frame_origin, origin, type))");
+      "PRIMARY KEY (top_frame_origin, origin, type))";
 
-  return db_.Execute(create_table.c_str());
+  return db_.Execute(kCreateStorageApiTable);
 }
 
 void AccessContextAuditDatabase::ComputeDatabaseMetrics() {
@@ -286,23 +277,19 @@ void AccessContextAuditDatabase::AddRecords(
 
   // Create both insert statements ahead of iterating over records. These are
   // highly likely to both be used, and should be in the statement cache.
-  std::string insert;
-  insert.append("INSERT OR REPLACE INTO ");
-  insert.append(kCookieTableName);
-  insert.append(
+  const char kInsertCookieRecord[] =
+      "INSERT OR REPLACE INTO cookies "
       "(top_frame_origin, name, domain, path, access_utc, is_persistent) "
-      "VALUES (?, ?, ?, ?, ?, ?)");
+      "VALUES (?, ?, ?, ?, ?, ?)";
   sql::Statement insert_cookie(
-      db_.GetCachedStatement(SQL_FROM_HERE, insert.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kInsertCookieRecord));
 
-  insert.clear();
-  insert.append("INSERT OR REPLACE INTO ");
-  insert.append(kStorageAPITableName);
-  insert.append(
+  const char kInsertStorageApiRecord[] =
+      "INSERT OR REPLACE INTO originStorageAPIs"
       "(top_frame_origin, type, origin, access_utc) "
-      "VALUES (?, ?, ?, ?)");
+      "VALUES (?, ?, ?, ?)";
   sql::Statement insert_storage_api(
-      db_.GetCachedStatement(SQL_FROM_HERE, insert.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kInsertStorageApiRecord));
 
   for (const auto& record : records) {
     if (record.type == StorageAPIType::kCookie) {
@@ -340,23 +327,22 @@ void AccessContextAuditDatabase::AddRecords(
 void AccessContextAuditDatabase::RemoveRecord(const AccessRecord& record) {
   sql::Statement remove_statement;
 
-  std::string remove;
-  remove.append("DELETE FROM ");
   if (record.type == StorageAPIType::kCookie) {
-    remove.append(kCookieTableName);
-    remove.append(
-        " WHERE top_frame_origin = ? AND name = ? AND domain = ? AND path = ?");
+    const char kRemoveCookieRecord[] =
+        "DELETE FROM cookies WHERE top_frame_origin = ? AND name = ? AND "
+        "domain = ? AND path = ?";
     remove_statement.Assign(
-        db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+        db_.GetCachedStatement(SQL_FROM_HERE, kRemoveCookieRecord));
     remove_statement.BindString(0, record.top_frame_origin.Serialize());
     remove_statement.BindString(1, record.name);
     remove_statement.BindString(2, record.domain);
     remove_statement.BindString(3, record.path);
   } else {
-    remove.append(kStorageAPITableName);
-    remove.append(" WHERE top_frame_origin = ? AND type = ? AND origin = ?");
+    const char kRemoveStorageApiRecord[] =
+        "DELETE FROM originStorageAPIs WHERE top_frame_origin = ? AND type = ? "
+        "AND origin = ?";
     remove_statement.Assign(
-        db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+        db_.GetCachedStatement(SQL_FROM_HERE, kRemoveStorageApiRecord));
     remove_statement.BindString(0, record.top_frame_origin.Serialize());
     remove_statement.BindInt(1, static_cast<int>(record.type));
     remove_statement.BindString(2, record.origin.Serialize());
@@ -371,14 +357,12 @@ void AccessContextAuditDatabase::RemoveAllRecords() {
   if (!transaction.Begin())
     return;
 
-  std::string delete_cookies_table = "DELETE FROM ";
-  delete_cookies_table.append(kCookieTableName);
-  if (!db_.Execute(delete_cookies_table.c_str()))
+  const char kClearCookiesTable[] = "DELETE FROM cookies";
+  if (!db_.Execute(kClearCookiesTable))
     return;
 
-  std::string delete_storage_api_table = "DELETE FROM ";
-  delete_storage_api_table.append(kStorageAPITableName);
-  if (!db_.Execute(delete_storage_api_table.c_str()))
+  const char kClearStorageApiTable[] = "DELETE FROM originStorageAPIs";
+  if (!db_.Execute(kClearStorageApiTable))
     return;
 
   transaction.Commit();
@@ -390,22 +374,20 @@ void AccessContextAuditDatabase::RemoveAllRecordsForTimeRange(base::Time begin,
   if (!transaction.Begin())
     return;
 
-  std::string remove = "DELETE FROM ";
-  remove.append(kCookieTableName);
-  remove.append(" WHERE access_utc BETWEEN ? AND ?");
+  const char kRemoveCookieRecords[] =
+      "DELETE FROM cookies WHERE access_utc BETWEEN ? AND ?";
   sql::Statement remove_cookies(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kRemoveCookieRecords));
   remove_cookies.BindInt64(0,
                            begin.ToDeltaSinceWindowsEpoch().InMicroseconds());
   remove_cookies.BindInt64(1, end.ToDeltaSinceWindowsEpoch().InMicroseconds());
   if (!remove_cookies.Run())
     return;
 
-  remove = "DELETE FROM ";
-  remove.append(kStorageAPITableName);
-  remove.append(" WHERE access_utc BETWEEN ? AND ?");
+  const char kRemoveStorageApiRecords[] =
+      "DELETE FROM originStorageAPIs WHERE access_utc BETWEEN ? AND ?";
   sql::Statement remove_storage_apis(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kRemoveStorageApiRecords));
   remove_storage_apis.BindInt64(
       0, begin.ToDeltaSinceWindowsEpoch().InMicroseconds());
   remove_storage_apis.BindInt64(
@@ -441,10 +423,9 @@ void AccessContextAuditDatabase::RemoveSessionOnlyRecords(
 
   // Extract the set of all domains from the cookies table, determine the
   // effective content setting, and store for removal if appropriate.
-  std::string select = "SELECT DISTINCT domain FROM ";
-  select.append(kCookieTableName);
+  const char kSelectCookieDomains[] = "SELECT DISTINCT domain FROM cookies";
   sql::Statement select_cookie_domains(
-      db_.GetCachedStatement(SQL_FROM_HERE, select.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kSelectCookieDomains));
 
   std::vector<std::string> cookie_domains_for_removal;
   while (select_cookie_domains.Step()) {
@@ -460,10 +441,10 @@ void AccessContextAuditDatabase::RemoveSessionOnlyRecords(
   }
 
   // Repeat the above, but for the origin keyed storage API table.
-  select = "SELECT DISTINCT origin FROM ";
-  select.append(kStorageAPITableName);
+  const char kSelectStorageOrigins[] =
+      "SELECT DISTINCT origin FROM originStorageAPIs";
   sql::Statement select_storage_origins(
-      db_.GetCachedStatement(SQL_FROM_HERE, select.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kSelectStorageOrigins));
 
   std::vector<std::string> storage_origins_for_removal;
   while (select_storage_origins.Step()) {
@@ -474,11 +455,9 @@ void AccessContextAuditDatabase::RemoveSessionOnlyRecords(
 
   // Remove entries belonging to cookie domains and origins identified as having
   // a SESSION_ONLY content setting.
-  std::string remove = "DELETE FROM ";
-  remove.append(kCookieTableName);
-  remove.append(" WHERE domain = ?");
+  const char kRemoveCookieRecords[] = "DELETE FROM cookies WHERE domain = ?";
   sql::Statement remove_cookies(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kRemoveCookieRecords));
 
   for (const auto& domain : cookie_domains_for_removal) {
     remove_cookies.BindString(0, domain);
@@ -487,11 +466,10 @@ void AccessContextAuditDatabase::RemoveSessionOnlyRecords(
     remove_cookies.Reset(true);
   }
 
-  remove = "DELETE FROM ";
-  remove.append(kStorageAPITableName);
-  remove.append(" WHERE origin = ?");
+  const char kRemoveStorageApiRecords[] =
+      "DELETE FROM originStorageAPIs WHERE origin = ?";
   sql::Statement remove_storage_apis(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kRemoveStorageApiRecords));
 
   for (const auto& origin : storage_origins_for_removal) {
     remove_storage_apis.BindString(0, origin);
@@ -507,12 +485,10 @@ void AccessContextAuditDatabase::RemoveAllRecordsForCookie(
     const std::string& name,
     const std::string& domain,
     const std::string& path) {
-  std::string remove;
-  remove.append("DELETE FROM ");
-  remove.append(kCookieTableName);
-  remove.append(" WHERE name = ? AND domain = ? AND path = ?");
+  const char kRemoveCookieRecords[] =
+      "DELETE FROM cookies WHERE name = ? AND domain = ? AND path = ?";
   sql::Statement remove_statement(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kRemoveCookieRecords));
   remove_statement.BindString(0, name);
   remove_statement.BindString(1, domain);
   remove_statement.BindString(2, path);
@@ -522,12 +498,10 @@ void AccessContextAuditDatabase::RemoveAllRecordsForCookie(
 void AccessContextAuditDatabase::RemoveAllRecordsForOriginKeyedStorage(
     const url::Origin& origin,
     StorageAPIType type) {
-  std::string remove;
-  remove.append("DELETE FROM ");
-  remove.append(kStorageAPITableName);
-  remove.append(" WHERE origin = ? AND type = ?");
+  const char kRemoveStorageApiRecords[] =
+      "DELETE FROM originStorageAPIs WHERE origin = ? AND type = ?";
   sql::Statement remove_statement(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kRemoveStorageApiRecords));
   remove_statement.BindString(0, origin.Serialize());
   remove_statement.BindInt(1, static_cast<int>(type));
   remove_statement.Run();
@@ -541,17 +515,15 @@ void AccessContextAuditDatabase::RemoveAllRecordsForTopFrameOrigins(
 
   // Remove all records with a top frame origin present in |origins| from both
   // the cookies and storage API tables.
-  std::string remove = "DELETE FROM ";
-  remove.append(kCookieTableName);
-  remove.append(" WHERE top_frame_origin = ?");
+  const char kRemoveTopFrameFromCookies[] =
+      "DELETE FROM cookies WHERE top_frame_origin = ?";
   sql::Statement remove_cookies(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kRemoveTopFrameFromCookies));
 
-  remove = "DELETE FROM ";
-  remove.append(kStorageAPITableName);
-  remove.append(" WHERE top_frame_origin = ?");
+  const char kRemoveTopFrameFromStorageApis[] =
+      "DELETE FROM originStorageAPIs WHERE top_frame_origin = ?";
   sql::Statement remove_storage_apis(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kRemoveTopFrameFromStorageApis));
 
   for (const auto& origin : origins) {
     remove_storage_apis.BindString(0, origin.Serialize());
@@ -572,13 +544,11 @@ std::vector<AccessContextAuditDatabase::AccessRecord>
 AccessContextAuditDatabase::GetAllRecords() {
   std::vector<AccessContextAuditDatabase::AccessRecord> records;
 
-  std::string select;
-  select.append(
+  const char kSelectCookieRecords[] =
       "SELECT top_frame_origin, name, domain, path, access_utc, is_persistent "
-      "FROM ");
-  select.append(kCookieTableName);
+      "FROM cookies";
   sql::Statement select_cookies(
-      db_.GetCachedStatement(SQL_FROM_HERE, select.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kSelectCookieRecords));
 
   while (select_cookies.Step()) {
     records.emplace_back(
@@ -590,11 +560,11 @@ AccessContextAuditDatabase::GetAllRecords() {
         select_cookies.ColumnBool(5));
   }
 
-  select.clear();
-  select.append("SELECT top_frame_origin, type, origin, access_utc FROM ");
-  select.append(kStorageAPITableName);
+  const char kSelectStorageApiRecords[] =
+      "SELECT top_frame_origin, type, origin, access_utc FROM "
+      "originStorageAPIs";
   sql::Statement select_storage_api(
-      db_.GetCachedStatement(SQL_FROM_HERE, select.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kSelectStorageApiRecords));
 
   while (select_storage_api.Step()) {
     records.emplace_back(
@@ -624,11 +594,11 @@ void AccessContextAuditDatabase::RemoveStorageApiRecords(
   // The number of records retrieved is sub-optimal by at most a factor of
   // StorageAPIType::kMaxType, so we're not missing sub-linear optimization
   // opportunity here.
-  std::string select = "SELECT origin, type FROM ";
-  select.append(kStorageAPITableName);
-  select.append(" WHERE access_utc BETWEEN ? AND ?");
+  const char kSelectOriginAndType[] =
+      "SELECT origin, type FROM originStorageAPIs WHERE access_utc BETWEEN ? "
+      "AND ?";
   sql::Statement select_storage_api(
-      db_.GetCachedStatement(SQL_FROM_HERE, select.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kSelectOriginAndType));
   select_storage_api.BindInt64(
       0, begin.ToDeltaSinceWindowsEpoch().InMicroseconds());
   select_storage_api.BindInt64(1,
@@ -647,11 +617,10 @@ void AccessContextAuditDatabase::RemoveStorageApiRecords(
     }
   }
 
-  std::string remove = "DELETE FROM ";
-  remove.append(kStorageAPITableName);
-  remove.append(" WHERE origin = ? AND type = ?");
+  const char kDeleteOnOriginAndType[] =
+      "DELETE FROM originStorageAPIs WHERE origin = ? AND type = ?";
   sql::Statement remove_statement(
-      db_.GetCachedStatement(SQL_FROM_HERE, remove.c_str()));
+      db_.GetCachedStatement(SQL_FROM_HERE, kDeleteOnOriginAndType));
 
   for (const auto& origin_type : origin_type_pairs_for_removal) {
     remove_statement.BindString(0, origin_type.first.Serialize());