Revert 222242 "[Activity Log] when extension is uninstalled, del..."

trunk/src/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 561 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::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.
-    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) {
     LOG(ERROR) << "Unable to connect to database";
     return;
   }
 
   queued_actions_.clear();
 
   // Not wrapped in a transaction because a late failure shouldn't undo a
@@ skipping 52 matching lines @@
                  page_url,
                  arg_url,
                  days_ago),
       callback);
 }
 
 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);
 }
 
 void CountingPolicy::OnDatabaseFailure() {
   queued_actions_.clear();
 }
 
 void CountingPolicy::OnDatabaseClose() {
   delete this;
@@ skipping 32 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