Extension activity log database refactoring (step 3)

chrome/browser/extensions/activity_log/stream_noargs_ui_policy_unittest.cc

 // Copyright 2013 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/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/activity_log/stream_noargs_ui_policy.h"
@@ skipping 50 matching lines @@
   static void RetrieveActions_LogAndFetchActions(
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     ASSERT_EQ(2, static_cast<int>(i->size()));
   }
 
   static void Arguments_Missing(
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     scoped_refptr<Action> last = i->front();
     std::string noargs =
         "ID=odlameecjipmbmbejkplpemijjgpljce CATEGORY=api_call "
-        "API=tabs.testMethod ARGS=[] OTHER={}";
+        "API=tabs.testMethod";
     ASSERT_EQ(noargs, last->PrintForDebug());
   }
 
  protected:
   ExtensionService* extension_service_;
   scoped_ptr<TestingProfile> profile_;
   content::TestBrowserThreadBundle thread_bundle_;
   // 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
@@ skipping 11 matching lines @@
   ActivityLogPolicy* policy = new StreamWithoutArgsUIPolicy(profile_.get());
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
           .SetManifest(DictionaryBuilder()
                        .Set("name", "Test extension")
                        .Set("version", "1.0.0")
                        .Set("manifest_version", 2))
           .Build();
   extension_service_->AddExtension(extension.get());
   scoped_ptr<base::ListValue> args(new base::ListValue());
-  policy->ProcessAction(ActivityLogPolicy::ACTION_API, extension->id(),
-      std::string("tabs.testMethod"), GURL(), args.get(), NULL);
+  scoped_refptr<Action> action =
+      new Action(extension->id(), base::Time::Now(), Action::ACTION_API_CALL);
+  action->set_api_name("tabs.testMethod");
+  action->set_args(args.Pass());
+  policy->ProcessAction(action);
   policy->Close();
 }
 
 TEST_F(StreamWithoutArgsUIPolicyTest, LogAndFetchActions) {
   ActivityLogPolicy* policy = new StreamWithoutArgsUIPolicy(profile_.get());
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
           .SetManifest(DictionaryBuilder()
                        .Set("name", "Test extension")
                        .Set("version", "1.0.0")
                        .Set("manifest_version", 2))
           .Build();
   extension_service_->AddExtension(extension.get());
-  scoped_ptr<base::ListValue> args(new base::ListValue());
   GURL gurl("http://www.google.com");
 
   // Write some API calls
-  policy->ProcessAction(ActivityLogPolicy::ACTION_API, extension->id(),
-      std::string("tabs.testMethod"), GURL(), args.get(), NULL);
-  policy->ProcessAction(ActivityLogPolicy::ACTION_DOM,
-                        extension->id(), std::string("document.write"),
-                        gurl, args.get(), NULL);
+  scoped_refptr<Action> action_api =
+      new Action(extension->id(), base::Time::Now(), Action::ACTION_API_CALL);
+  action_api->set_api_name("tabs.testMethod");
+  action_api->set_args(make_scoped_ptr(new base::ListValue()));
+  policy->ProcessAction(action_api);
+
+  scoped_refptr<Action> action_dom =
+      new Action(extension->id(), base::Time::Now(), Action::ACTION_DOM_ACCESS);
+  action_dom->set_api_name("document.write");
+  action_dom->set_args(make_scoped_ptr(new base::ListValue()));
+  action_dom->set_page_url(gurl);
+  policy->ProcessAction(action_dom);
+
   policy->ReadData(extension->id(), 0,
       base::Bind(
           StreamWithoutArgsUIPolicyTest::RetrieveActions_LogAndFetchActions));
 
   policy->Close();
 }
 
 TEST_F(StreamWithoutArgsUIPolicyTest, LogWithoutArguments) {
   ActivityLogPolicy* policy = new StreamWithoutArgsUIPolicy(profile_.get());
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
           .SetManifest(DictionaryBuilder()
                        .Set("name", "Test extension")
                        .Set("version", "1.0.0")
                        .Set("manifest_version", 2))
           .Build();
   extension_service_->AddExtension(extension.get());
+
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Set(0, new base::StringValue("hello"));
   args->Set(1, new base::StringValue("world"));
-  policy->ProcessAction(ActivityLogPolicy::ACTION_API, extension->id(),
-      std::string("tabs.testMethod"), GURL(), args.get(), NULL);
+  scoped_refptr<Action> action =
+      new Action(extension->id(), base::Time::Now(), Action::ACTION_API_CALL);
+  action->set_api_name("tabs.testMethod");
+  action->set_args(args.Pass());
+
+  policy->ProcessAction(action);
   policy->ReadData(extension->id(), 0,
       base::Bind(StreamWithoutArgsUIPolicyTest::Arguments_Missing));
   policy->Close();
 }
 
 }  // namespace extensions