[Activity Log] when extension is uninstalled, delete data about it

chrome/browser/extensions/activity_log/counting_policy.cc

Index: chrome/browser/extensions/activity_log/counting_policy.cc
diff --git a/chrome/browser/extensions/activity_log/counting_policy.cc b/chrome/browser/extensions/activity_log/counting_policy.cc
index 3d55a1e808f72aae51a1356ae814bf557c2381be..45952e89dbf9e77c3895df2e70ad9e53c9ccf561 100644
--- a/chrome/browser/extensions/activity_log/counting_policy.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy.cc
@@ -579,6 +579,40 @@ void CountingPolicy::DoRemoveURLs(const std::vector<GURL>& restrict_urls) {
   CleanStringTables(db);
 }
 
+void CountingPolicy::DoRemoveExtensionData(const std::string& extension_id) {
+  if (extension_id.empty())
+    return;
+
+  sql::Connection* db = GetDatabaseConnection();
+  if (!db) {
+    LOG(ERROR) << "Unable to connect to database";
+    return;
+  }
+
+  // Make sure any queued in memory are sent to the database before cleaning.
+  activity_database()->AdviseFlush(ActivityDatabase::kFlushImmediately);
+
+  std::string sql_str = base::StringPrintf(
+      "DELETE FROM %s WHERE extension_id_x=?", kTableName);
+  sql::Statement statement(
+      db->GetCachedStatement(sql::StatementID(SQL_FROM_HERE), sql_str.c_str()));
+  int64 id;
+  if (string_table_.StringToInt(db, extension_id, &id)) {
+    statement.BindInt64(0, id);
+  } else {
+    // If the string isn't listed, that means we never recorded anything about
+    // the extension so there's no deletion to do.
+    statement.Clear();
+    return;
+  }
+  if (!statement.Run()) {
+    LOG(ERROR) << "Removing URLs for extension "
+               << extension_id << "from database failed: "
+               << statement.GetSQLStatement();
+  }
+  CleanStringTables(db);
+}
+
 void CountingPolicy::DoDeleteDatabase() {
   sql::Connection* db = GetDatabaseConnection();
   if (!db) {
@@ -651,6 +685,10 @@ void CountingPolicy::RemoveURLs(const std::vector<GURL>& restrict_urls) {
   ScheduleAndForget(this, &CountingPolicy::DoRemoveURLs, restrict_urls);
 }
 
+void CountingPolicy::RemoveExtensionData(const std::string& extension_id) {
+  ScheduleAndForget(this, &CountingPolicy::DoRemoveExtensionData, extension_id);
+}
+
 void CountingPolicy::DeleteDatabase() {
   ScheduleAndForget(this, &CountingPolicy::DoDeleteDatabase);
 }