Add deletion to the activityLogPrivate API

chrome/browser/extensions/activity_log/counting_policy.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A policy for storing activity log data to a database that performs
 // aggregation to reduce the size of the database.  The database layout is
 // nearly the same as FullStreamUIPolicy, which stores a complete log, with a
 // few changes:
 //   - a "count" column is added to track how many log records were merged
 //     together into this row
@@ skipping 424 matching lines @@
     where_next = " AND ";
   }
   if (!page_url.empty()) {
     where_str += where_next + "page_url LIKE ?";
     where_next = " AND ";
   }
   if (!arg_url.empty())
     where_str += where_next + "arg_url LIKE ?";
   std::string query_str = base::StringPrintf(
       "SELECT extension_id,time, action_type, api_name, args, page_url,"
-      "page_title, arg_url, other, count FROM %s WHERE %s ORDER BY count DESC "
+      "page_title, arg_url, other, count FROM %s %s %s ORDER BY time DESC "
       "LIMIT 300",
       kReadViewName,
+      where_str.empty() ? "" : "WHERE",
       where_str.c_str());
   sql::Statement query(db->GetUniqueStatement(query_str.c_str()));
   int i = -1;
   if (!extension_id.empty())
     query.BindString(++i, extension_id);
   if (!api_name.empty())
     query.BindString(++i, api_name);
   if (type != Action::ACTION_ANY)
     query.BindInt(++i, static_cast<int>(type));
   if (!page_url.empty())
@@ skipping 175 matching lines @@
       return;
     }
   }
 
   // Clean up unused strings from the strings and urls table to really delete
   // the urls and page titles. Should be called even if an error occured when
   // removing a URL as there may some things to clean up.
   CleanStringTables(db);
 }
 
+void CountingPolicy::DoDeleteDatabase() {
+  sql::Connection* db = GetDatabaseConnection();
+  if (!db) {
+    LOG(ERROR) << "Unable to connect to database";
+    return;
+  }
+
+  queued_actions_.clear();
+
+  // Not wrapped in a transaction because a late failure shouldn't undo a
+  // previous deletion.
+  std::string sql_str = base::StringPrintf("DELETE FROM %s", kTableName);
+  sql::Statement statement(db->GetCachedStatement(
+      sql::StatementID(SQL_FROM_HERE),
+      sql_str.c_str()));
+  if (!statement.Run()) {
+    LOG(ERROR) << "Deleting the database failed: "
+               << statement.GetSQLStatement();
+    return;
+  }
+  statement.Clear();
+  statement.Assign(db->GetCachedStatement(sql::StatementID(SQL_FROM_HERE),
+                                          "DELETE FROM string_ids"));
+  if (!statement.Run()) {
+    LOG(ERROR) << "Deleting the database failed: "
+               << statement.GetSQLStatement();
+    return;
+  }
+  statement.Clear();
+  statement.Assign(db->GetCachedStatement(sql::StatementID(SQL_FROM_HERE),
+                                          "DELETE FROM url_ids"));
+  if (!statement.Run()) {
+    LOG(ERROR) << "Deleting the database failed: "
+               << statement.GetSQLStatement();
+    return;
+  }
+  statement.Clear();
+  statement.Assign(db->GetCachedStatement(sql::StatementID(SQL_FROM_HERE),
+                                          "VACUUM"));
+  if (!statement.Run()) {
+    LOG(ERROR) << "Vacuuming the database failed: "
+               << statement.GetSQLStatement();
+  }
+}
+
 void CountingPolicy::ReadData(
     const std::string& extension_id,
     const int day,
     const base::Callback<void(scoped_ptr<Action::ActionVector>)>& callback) {
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::DB,
       FROM_HERE,
       base::Bind(&CountingPolicy::DoReadData,
                  base::Unretained(this),
                  extension_id,
@@ skipping 19 matching lines @@
                  api_name,
                  page_url,
                  arg_url),
       callback);
 }
 
 void CountingPolicy::RemoveURLs(const std::vector<GURL>& restrict_urls) {
   ScheduleAndForget(this, &CountingPolicy::DoRemoveURLs, restrict_urls);
 }
 
+void CountingPolicy::DeleteDatabase() {
+  ScheduleAndForget(this, &CountingPolicy::DoDeleteDatabase);
+}
+
 void CountingPolicy::OnDatabaseFailure() {
   queued_actions_.clear();
 }
 
 void CountingPolicy::OnDatabaseClose() {
   delete this;
 }
 
 // Cleans old records from the activity log database.
 bool CountingPolicy::CleanOlderThan(sql::Connection* db,
@@ skipping 28 matching lines @@
   return true;
 }
 
 void CountingPolicy::Close() {
   // The policy object should have never been created if there's no DB thread.
   DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::DB));
   ScheduleAndForget(activity_database(), &ActivityDatabase::Close);
 }
 
 }  // namespace extensions