Extension activity log database refactoring (step 2)

chrome/browser/extensions/activity_log/activity_log_unittest.cc

 // Copyright (c) 2012 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/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
@@ skipping 66 matching lines @@
     ASSERT_EQ(2, static_cast<int>(i->size()));
   }
 
   static void RetrieveActions_LogAndFetchPathActions(
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     std::string args;
     ASSERT_EQ(1U, i->size());
     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());
   }
 
   static void Arguments_Missing(
       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());
   }
 
   static void Arguments_Present(
       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={}";
     ASSERT_EQ(args, last->PrintForDebug());
   }
 
   void SetPolicy(bool log_arguments) {
     ActivityLog* activity_log = ActivityLog::GetInstance(profile());
     if (log_arguments)
       activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_FULLSTREAM);
     else
       activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_NOARGS);
   }
 
   static void Arguments_Prerender(
       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());
   }
 
   ExtensionService* extension_service_;
   // Used to preserve a copy of the original command line.
   // The test framework will do this itself as well. However, by then,
   // it is too late to call ActivityLog::RecomputeLoggingIsEnabled() in
   // TearDown().
   CommandLine saved_cmdline_;
 
@@ skipping 120 matching lines @@
   static_cast<TabHelper::ScriptExecutionObserver*>(activity_log)->
       OnScriptsExecuted(contents, executing_scripts, 0, url);
 
   activity_log->GetActions(
       extension->id(), 0, base::Bind(ActivityLogTest::Arguments_Prerender));
 
   prerender_manager->CancelAllPrerenders();
 }
 
 }  // namespace extensions