Extension activity log database refactoring (step 2)

chrome/browser/extensions/activity_log/activity_log_unittest.cc

Index: chrome/browser/extensions/activity_log/activity_log_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index e9f2c3ec6c8abc201155aba24b1651372b97f3e2..686ff1c7712c49cfaef9227b09f552398d7d3b46 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -84,11 +84,15 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
     scoped_refptr<Action> last = i->front();
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableExtensionActivityLogTesting))
-      args = "Injected scripts () onto "
-              "http://www.google.com/foo?bar extra";
+      args =
+          "ID=abc CATEGORY=content_script API=document.write ARGS=[\"\"] "
+          "PAGE_URL=http://www.google.com/foo?bar "
+          "OTHER={\"dom_verb\":3,\"extra\":\"extra\",\"page_title\":\"\"}";
     else
-      args = "Injected scripts () onto "
-              "http://www.google.com/foo extra";
+      args =
+          "ID=abc CATEGORY=content_script API=document.write ARGS=[\"\"] "
+          "PAGE_URL=http://www.google.com/foo "
+          "OTHER={\"dom_verb\":3,\"extra\":\"extra\",\"page_title\":\"\"}";
     ASSERT_EQ(args, last->PrintForDebug());
   }
 
@@ -96,8 +100,8 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     scoped_refptr<Action> last = i->front();
     std::string id(kExtensionId);
-    std::string noargs = "ID: " + id + ", CATEGORY: "
-        "call, API: tabs.testMethod, ARGS: ";
+    std::string noargs =
+        "ID=" + id + " CATEGORY=api_call API=tabs.testMethod ARGS=[] OTHER={}";
     ASSERT_EQ(noargs, last->PrintForDebug());
   }
 
@@ -105,8 +109,8 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     scoped_refptr<Action> last = i->front();
     std::string id(kExtensionId);
-    std::string args = "ID: " + id + ", CATEGORY: "
-        "call, API: extension.connect, ARGS: \"hello\", \"world\"";
+    std::string args = "ID=" + id + " CATEGORY=api_call API=extension.connect "
+                                    "ARGS=[\"hello\",\"world\"] OTHER={}";

[felt, 2013/07/18 17:09:59]

is the spacing like that on purpose?

[mvrable, 2013/07/18 18:20:34]

I'm not sure how it ended up like that, but fixed now.

     ASSERT_EQ(args, last->PrintForDebug());
   }
 
@@ -122,8 +126,10 @@ class ActivityLogTest : public ChromeRenderViewHostTestHarness {
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     ASSERT_EQ(1U, i->size());
     scoped_refptr<Action> last = i->front();
-    std::string args = "Injected scripts (\"script \") "
-        "onto http://www.google.com/ (prerender)";
+    std::string args =
+        "ID=odlameecjipmbmbejkplpemijjgpljce CATEGORY=content_script API= "
+        "ARGS=[\"\\\"script \\\"\"] PAGE_URL=http://www.google.com/ "
+        "OTHER={\"dom_verb\":3,\"extra\":\"(prerender)\",\"page_title\":\"\"}";
     ASSERT_EQ(args, last->PrintForDebug());
   }