Update tests to check fields directly.

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 72 matching lines @@
 
   bool GetWatchdogActive() {
     ActivityLog* activity_log = ActivityLog::GetInstance(profile());
     return activity_log->IsWatchdogAppActive();
   }
 
   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={\"prerender\":true}";
-    ASSERT_EQ(args, last->PrintForDebug());
+
+    ASSERT_EQ("odlameecjipmbmbejkplpemijjgpljce", last->extension_id());
+    ASSERT_EQ(Action::ACTION_CONTENT_SCRIPT, last->action_type());
+    ASSERT_EQ("[\"script\"]",
+              ActivityLogPolicy::Util::Serialize(last->args()));
+    ASSERT_EQ("http://www.google.com/", last->SerializePageUrl());
+    ASSERT_EQ("{\"prerender\":true}",
+              ActivityLogPolicy::Util::Serialize(last->other()));
+    ASSERT_EQ("", last->api_name());
+    ASSERT_EQ("", last->page_title());
+    ASSERT_EQ("", last->SerializeArgUrl());
   }
 
   ExtensionService* extension_service_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 };
@@ skipping 63 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