| Index: chrome/browser/extensions/activity_log_unittest.cc
|
| diff --git a/chrome/browser/extensions/activity_log_unittest.cc b/chrome/browser/extensions/activity_log_unittest.cc
|
| index f678d7b481dca542d32fd591fa16785f2fffa8f0..a5ecc95502d6697853c1ae582b5c226885a36d4d 100644
|
| --- a/chrome/browser/extensions/activity_log_unittest.cc
|
| +++ b/chrome/browser/extensions/activity_log_unittest.cc
|
| @@ -93,10 +93,8 @@ TEST_F(ActivityLogTest, Construct) {
|
| extension_service_->AddExtension(extension);
|
| scoped_ptr<ListValue> args(new ListValue());
|
| ASSERT_TRUE(ActivityLog::IsLogEnabled());
|
| - activity_log->LogAPIAction(extension,
|
| - std::string("tabs.testMethod"),
|
| - args.get(),
|
| - "");
|
| + activity_log->LogAPIAction(
|
| + extension, std::string("tabs.testMethod"), args.get(), std::string());
|
| }
|
|
|
| TEST_F(ActivityLogTest, LogAndFetchActions) {
|
| @@ -113,10 +111,8 @@ TEST_F(ActivityLogTest, LogAndFetchActions) {
|
| ASSERT_TRUE(ActivityLog::IsLogEnabled());
|
|
|
| // Write some API calls
|
| - activity_log->LogAPIAction(extension,
|
| - std::string("tabs.testMethod"),
|
| - args.get(),
|
| - "");
|
| + activity_log->LogAPIAction(
|
| + extension, std::string("tabs.testMethod"), args.get(), std::string());
|
| activity_log->LogDOMAction(extension,
|
| GURL("http://www.google.com"),
|
| string16(),
|
| @@ -144,14 +140,10 @@ TEST_F(ActivityLogTest, LogWithoutArguments) {
|
| scoped_ptr<ListValue> args(new ListValue());
|
| args->Set(0, new base::StringValue("hello"));
|
| args->Set(1, new base::StringValue("world"));
|
| - activity_log->LogAPIAction(extension,
|
| - std::string("tabs.testMethod"),
|
| - args.get(),
|
| - "");
|
| + activity_log->LogAPIAction(
|
| + extension, std::string("tabs.testMethod"), args.get(), std::string());
|
| activity_log->GetActions(
|
| - extension->id(),
|
| - 0,
|
| - base::Bind(ActivityLogTest::Arguments_Missing));
|
| + extension->id(), 0, base::Bind(ActivityLogTest::Arguments_Missing));
|
| }
|
|
|
| TEST_F(ActivityLogTest, LogWithArguments) {
|
| @@ -169,14 +161,10 @@ TEST_F(ActivityLogTest, LogWithArguments) {
|
| scoped_ptr<ListValue> args(new ListValue());
|
| args->Set(0, new base::StringValue("hello"));
|
| args->Set(1, new base::StringValue("world"));
|
| - activity_log->LogAPIAction(extension,
|
| - std::string("extension.connect"),
|
| - args.get(),
|
| - "");
|
| + activity_log->LogAPIAction(
|
| + extension, std::string("extension.connect"), args.get(), std::string());
|
| activity_log->GetActions(
|
| - extension->id(),
|
| - 0,
|
| - base::Bind(ActivityLogTest::Arguments_Present));
|
| + extension->id(), 0, base::Bind(ActivityLogTest::Arguments_Present));
|
| }
|
|
|
| } // namespace extensions
|
|
|