Extension activity log database refactoring (step 2)

chrome/browser/extensions/activity_log/activity_log_browsertest.cc

Index: chrome/browser/extensions/activity_log/activity_log_browsertest.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
index 6bb158fbb8bf347229bd470ca72c0b46019b1b1f..29920b43d9ed51047bf8a84606e19e7fc18b7c6f 100644
--- a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
@@ -34,7 +34,9 @@ class ActivityLogPrerenderTest : public ExtensionApiTest {
                                     switches::kPrerenderModeSwitchValueEnabled);
   }
 
-  static void Prerender_Arguments(int port,
+  static void Prerender_Arguments(
+      const std::string& extension_id,
+      int port,
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     // This is to exit RunLoop (base::MessageLoop::current()->Run()) below
     base::MessageLoop::current()->PostTask(
@@ -44,9 +46,10 @@ class ActivityLogPrerenderTest : public ExtensionApiTest {
     scoped_refptr<Action> last = i->front();
 
     std::string args = base::StringPrintf(
-        "Injected scripts (\"/google_cs.js \") "
-        "onto http://www.google.com.bo:%d/test.html (prerender)",
-        port);
+        "ID=%s CATEGORY=content_script API= "
+        "ARGS=[\"\\\"/google_cs.js \\\"\"] "
+        "PAGE_URL=http://www.google.com.bo:%d/test.html OTHER={\"dom_verb\":3,\"extra\":\"(prerender)\",\"page_title\":\"www.google.com.bo:%d/test.html\"}",

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

line wrap

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

Done.

+        extension_id.c_str(), port, port);
     // TODO: Replace PrintForDebug with field testing
     // when this feature will be available
     ASSERT_EQ(args, last->PrintForDebug());
@@ -98,7 +101,7 @@ IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) {
 
   activity_log->GetActions(
       ext->id(), 0, base::Bind(
-          ActivityLogPrerenderTest::Prerender_Arguments, port));
+          ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port));
 
   // Allow invocation of Prerender_Arguments
   base::MessageLoop::current()->Run();