[Activity log] Generalize the whitelist for keeping arguments

chrome/browser/extensions/activity_log/activity_log_policy.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 "chrome/browser/extensions/activity_log/activity_log_policy.h"
 
 #include <stdint.h>
 
 #include "base/files/file_path.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 105 matching lines @@
       DictionaryValue::Iterator details_iterator(*details);
       while (!details_iterator.IsAtEnd()) {
         details->SetBoolean(details_iterator.key(), true);
         details_iterator.Advance();
       }
     }
   }
 }
 
 // static
-void ActivityLogPolicy::Util::StripArguments(
-    const std::set<std::string>& api_whitelist,
-    scoped_refptr<Action> action) {
-  if (action->action_type() != Action::ACTION_API_CALL &&
-      action->action_type() != Action::ACTION_API_EVENT &&
-      action->action_type() != Action::UNUSED_ACTION_API_BLOCKED)
-    return;
-
-  if (api_whitelist.find(action->api_name()) == api_whitelist.end())
+void ActivityLogPolicy::Util::StripArguments(const ApiSet& api_whitelist,
+                                             scoped_refptr<Action> action) {
+  if (api_whitelist.find(
+          std::make_pair(action->action_type(), action->api_name())) ==
+      api_whitelist.end()) {
     action->set_args(scoped_ptr<ListValue>());
+  }
 }
 
 // static
 base::Time ActivityLogPolicy::Util::AddDays(const base::Time& base_date,
                                             int days) {
   // To allow for time zone changes, add an additional partial day then round
   // down to midnight.
   return (base_date + base::TimeDelta::FromDays(days) +
           base::TimeDelta::FromHours(4)).LocalMidnight();
 }
@@ skipping 24 matching lines @@
           base::StringPrintf("DROP TABLE %s", table_name);
       if (!db->Execute(drop_statement.c_str())) {
         return false;
       }
     }
   }
   return true;
 }
 
 }  // namespace extensions