Extension activity log database refactoring (step 3)

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"
-#include "chrome/browser/extensions/activity_log/dom_actions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/dom_action_types.h"
 #include "chrome/common/extensions/extension_builder.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ skipping 56 matching lines @@
   }
 
   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 =
-          "ID=abc CATEGORY=content_script API=document.write 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\":\"\"}";
+          "OTHER={\"dom_verb\":3,\"extra\":\"extra\"}";
     else
       args =
-          "ID=abc CATEGORY=content_script API=document.write 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\":\"\"}";
+          "OTHER={\"dom_verb\":3,\"extra\":\"extra\"}";
     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=api_call API=tabs.testMethod ARGS=[] OTHER={}";
+        "ID=" + id + " CATEGORY=api_call API=tabs.testMethod";
     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=api_call API=extension.connect "
-                       "ARGS=[\"hello\",\"world\"] OTHER={}";
+                       "ARGS=[\"hello\",\"world\"]";
     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 =
         "ID=odlameecjipmbmbejkplpemijjgpljce CATEGORY=content_script API= "
-        "ARGS=[\"\\\"script \\\"\"] PAGE_URL=http://www.google.com/ "
-        "OTHER={\"dom_verb\":3,\"extra\":\"(prerender)\",\"page_title\":\"\"}";
+        "ARGS=[\"script \"] PAGE_URL=http://www.google.com/ "
+        "OTHER={\"dom_verb\":3,\"extra\":\"(prerender)\"}";
     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 121 matching lines @@
       OnScriptsExecuted(contents, executing_scripts, 0, url);
 
   activity_log->GetActions(
       extension->id(), 0, base::Bind(ActivityLogTest::Arguments_Prerender));
 
   prerender_manager->CancelAllPrerenders();
 }
 
 }  // namespace extensions