Revert 205059 "We were seeing ActivityLog memory leaks and assor..."

trunk/src/chrome/browser/extensions/activity_log/dom_actions.cc

 // Copyright (c) 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.
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/activity_log/dom_actions.h"
 #include "chrome/browser/history/url_database.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 88 matching lines @@
   }
   // Now initialize the table.
   bool initialized = InitializeTableInternal(db,
                                              kTableName,
                                              kTableContentFields,
                                              kTableFieldTypes,
                                              arraysize(kTableContentFields));
   return initialized;
 }
 
-bool DOMAction::Record(sql::Connection* db) {
+void DOMAction::Record(sql::Connection* db) {
   std::string sql_str = "INSERT INTO " + std::string(kTableName) +
       " (extension_id, time, url_action_type, url, url_title, api_call, args,"
       "  extra) VALUES (?,?,?,?,?,?,?,?)";
   sql::Statement statement(db->GetCachedStatement(
       sql::StatementID(SQL_FROM_HERE), sql_str.c_str()));
   statement.BindString(0, extension_id());
   statement.BindInt64(1, time().ToInternalValue());
   statement.BindInt(2, static_cast<int>(verb_));
   statement.BindString(3, history::URLDatabase::GURLToDatabaseURL(url_));
   statement.BindString16(4, url_title_);
   statement.BindString(5, api_call_);
   statement.BindString(6, args_);
   statement.BindString(7, extra_);
-  if (!statement.Run()) {
+  if (!statement.Run())
     LOG(ERROR) << "Activity log database I/O failed: " << sql_str;
-    statement.Clear();
-    return false;
-  }
-  return true;
 }
 
 std::string DOMAction::PrintForDebug() {
   if (verb_ == DomActionType::INSERTED)
     return "Injected scripts (" + args_ + ") onto "
         + std::string(url_.spec()) + (extra_.empty() ? extra_ : " " + extra_);
   else
     return "DOM API CALL: " + api_call_ + ", ARGS: " + args_ + ", VERB: "
         + VerbAsString();
 }
@@ skipping 14 matching lines @@
       return "webrequest";
     case DomActionType::MODIFIED:    // legacy
       return "modified";
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace extensions