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

trunk/src/chrome/browser/extensions/activity_log/api_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/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/activity_log/api_actions.h"
 #include "chrome/browser/extensions/activity_log/api_name_constants.h"
@@ skipping 168 matching lines @@
     }
   }
   // Now initialize the table.
   return InitializeTableInternal(db,
                                  kTableName,
                                  kTableContentFields,
                                  kTableFieldTypes,
                                  arraysize(kTableContentFields));
 }
 
-bool APIAction::Record(sql::Connection* db) {
+void APIAction::Record(sql::Connection* db) {
   std::string sql_str = "INSERT INTO " + std::string(kTableName)
       + " (extension_id, time, api_type, 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>(type_));
   statement.BindString(3, APINameMap::GetInstance()->ApiToShortname(api_call_));
   statement.BindString(4, args_);
   statement.BindString(5, extra_);
-  if (!statement.Run()) {
+  if (!statement.Run())
     LOG(ERROR) << "Activity log database I/O failed: " << sql_str;
-    statement.Clear();
-    return false;
-  }
-  return true;
 }
 
 // static
 void APIAction::LookupTabId(const std::string& api_call,
                             ListValue* args,
                             Profile* profile) {
   if (api_call == "tabs.get" ||                 // api calls, ID as int
       api_call == "tabs.connect" ||
       api_call == "tabs.sendMessage" ||
       api_call == "tabs.duplicate" ||
@@ skipping 42 matching lines @@
       return "call";
     case EVENT_CALLBACK:
       return "event_callback";
     default:
       return "unknown_type";
   }
 }
 
 }  // namespace extensions