[Activity log] Generalize the whitelist for keeping arguments

chrome/browser/extensions/activity_log/activity_log_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/values.h"
 #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
 #include "chrome/browser/extensions/activity_log/activity_actions.h"
 #include "chrome/browser/extensions/activity_log/activity_log_policy.h"
 #include "chrome/browser/extensions/activity_log/web_request_constants.h"
 #include "chrome/common/extensions/value_builder.h"
@@ skipping 41 matching lines @@
 
   ActivityLogPolicy::Util::StripPrivacySensitiveFields(action);
 
   ASSERT_EQ(
       "{\"web_request\":{\"added_request_headers\":true,\"new_url\":true}}",
       ActivityLogPolicy::Util::Serialize(action->other()));
 }
 
 // Test that argument values are stripped as appropriate.
 TEST_F(ActivityLogPolicyUtilTest, StripArguments) {
-  std::set<std::string> whitelist;
-  whitelist.insert("tabs.executeScript");
+  ActivityLogPolicy::Util::ApiSet whitelist;
+  whitelist.insert(
+      std::make_pair(Action::ACTION_API_CALL, "tabs.executeScript"));
 
   // API is in whitelist; not stripped.
   scoped_refptr<Action> action =
       new Action("punky",
                  base::Time::Now(),
                  Action::ACTION_API_CALL,
                  "tabs.executeScript");
   action->mutable_args()->AppendString("woof");
   ActivityLogPolicy::Util::StripArguments(whitelist, action);
   ASSERT_EQ("[\"woof\"]", ActivityLogPolicy::Util::Serialize(action->args()));
 
   // Not in whitelist: stripped.
   action = new Action(
       "punky", base::Time::Now(), Action::ACTION_API_CALL, "tabs.create");
   action->mutable_args()->AppendString("woof");
   ActivityLogPolicy::Util::StripArguments(whitelist, action);
   ASSERT_EQ("", ActivityLogPolicy::Util::Serialize(action->args()));
-
-  // Not an API type: not stripped.
-  action = new Action(
-      "punky", base::Time::Now(), Action::ACTION_DOM_ACCESS, "tabs.create");
-  action->mutable_args()->AppendString("woof");
-  ActivityLogPolicy::Util::StripArguments(whitelist, action);
-  ASSERT_EQ("[\"woof\"]", ActivityLogPolicy::Util::Serialize(action->args()));
 }
 
 // Test parsing of URLs serialized to strings.
 TEST_F(ActivityLogPolicyUtilTest, ParseUrls) {
   scoped_refptr<Action> action =
       new Action("punky",
                  base::Time::Now(),
                  Action::ACTION_API_CALL,
                  "tabs.executeScript");
   action->ParsePageUrl("<incognito>http://www.google.com/");
   EXPECT_EQ("http://www.google.com/", action->page_url().spec());
   EXPECT_TRUE(action->page_incognito());
 }
 
 }  // namespace extensions