Alter the ActivityLog db table schemas.

chrome/browser/extensions/activity_database_unittest.cc

Index: chrome/browser/extensions/activity_database_unittest.cc
diff --git a/chrome/browser/extensions/activity_database_unittest.cc b/chrome/browser/extensions/activity_database_unittest.cc
index 1c1938cbff62c57d6957560c1299e1e8acace62f..d7b3c4b0ae3426e0cb365113defa340cfb626f3c 100644
--- a/chrome/browser/extensions/activity_database_unittest.cc
+++ b/chrome/browser/extensions/activity_database_unittest.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/extensions/activity_database.h"
 #include "chrome/browser/extensions/api_actions.h"
 #include "chrome/browser/extensions/blocked_actions.h"
-#include "chrome/browser/extensions/url_actions.h"
+#include "chrome/browser/extensions/dom_actions.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -31,14 +31,14 @@ TEST(ActivityDatabaseTest, Init) {
 
   sql::Connection db;
   ASSERT_TRUE(db.Open(db_file));
-  ASSERT_TRUE(db.DoesTableExist(UrlAction::kTableName));
+  ASSERT_TRUE(db.DoesTableExist(DOMAction::kTableName));
   ASSERT_TRUE(db.DoesTableExist(APIAction::kTableName));
   ASSERT_TRUE(db.DoesTableExist(BlockedAction::kTableName));
   db.Close();
 }
 
-// Check that actions are recorded in the db.
-TEST(ActivityDatabaseTest, RecordAction) {
+// Check that API actions are recorded in the db.
+TEST(ActivityDatabaseTest, RecordAPIAction) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -56,7 +56,8 @@ TEST(ActivityDatabaseTest, RecordAction) {
       APIAction::READ,
       APIAction::BOOKMARK,
       "brewster",
-      "");
+      "woof",
+      "extra");
   activity_db->RecordAction(action);
   activity_db->Close();
   activity_db->Release();
@@ -74,6 +75,45 @@ TEST(ActivityDatabaseTest, RecordAction) {
   ASSERT_EQ("READ", statement.ColumnString(3));
   ASSERT_EQ("BOOKMARK", statement.ColumnString(4));
   ASSERT_EQ("brewster", statement.ColumnString(5));
+  ASSERT_EQ("woof", statement.ColumnString(6));
+}
+
+// Check that blocked actions are recorded in the db.
+TEST(ActivityDatabaseTest, RecordBlockedAction) {
+  base::ScopedTempDir temp_dir;
+  FilePath db_file;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  db_file = temp_dir.path().AppendASCII("ActivityRecord.db");
+  file_util::Delete(db_file, false);
+
+  ActivityDatabase* activity_db = new ActivityDatabase();
+  activity_db->AddRef();
+  activity_db->Init(db_file);
+  ASSERT_TRUE(activity_db->initialized());
+  scoped_refptr<BlockedAction> action = new BlockedAction(
+      "punky",
+      base::Time::Now(),
+      "do.evilThings",
+      "1, 2",
+      "because i said so",
+      "extra");
+  activity_db->RecordAction(action);
+  activity_db->Close();
+  activity_db->Release();
+
+  sql::Connection db;
+  ASSERT_TRUE(db.Open(db_file));
+
+  ASSERT_TRUE(db.DoesTableExist(BlockedAction::kTableName));
+  std::string sql_str = "SELECT * FROM " +
+      std::string(BlockedAction::kTableName);
+  sql::Statement statement(db.GetUniqueStatement(sql_str.c_str()));
+  ASSERT_TRUE(statement.Step());
+  ASSERT_EQ("punky", statement.ColumnString(0));
+  ASSERT_EQ("do.evilThings", statement.ColumnString(2));
+  ASSERT_EQ("1, 2", statement.ColumnString(3));
+  ASSERT_EQ("because i said so", statement.ColumnString(4));
+  ASSERT_EQ("extra", statement.ColumnString(5));
 }
 
 // Check that nothing explodes if the DB isn't initialized.
@@ -93,7 +133,8 @@ TEST(ActivityDatabaseTest, InitFailure) {
       APIAction::READ,
       APIAction::BOOKMARK,
       "brewster",
-      "");
+      "woooof",
+      "extra");
   activity_db->RecordAction(action);
   activity_db->Close();
   activity_db->Release();