Activity Log: allow searching by day

chrome/browser/extensions/activity_log/counting_policy.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_COUNTING_POLICY_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_COUNTING_POLICY_H_
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "chrome/browser/extensions/activity_log/activity_database.h"
 #include "chrome/browser/extensions/activity_log/activity_log_policy.h"
 #include "chrome/browser/extensions/activity_log/database_string_table.h"
 
 namespace extensions {
 
 // A policy for logging the stream of actions, but without arguments.
 class CountingPolicy : public ActivityLogDatabasePolicy {
  public:
   explicit CountingPolicy(Profile* profile);
   virtual ~CountingPolicy();
 
   virtual void ProcessAction(scoped_refptr<Action> action) OVERRIDE;
 
-  virtual void ReadData(
-      const std::string& extension_id,
-      const int day,
-      const base::Callback
-          <void(scoped_ptr<Action::ActionVector>)>& callback) OVERRIDE;
-
   virtual void ReadFilteredData(
       const std::string& extension_id,
       const Action::ActionType type,
       const std::string& api_name,
       const std::string& page_url,
       const std::string& arg_url,
+      const int days_ago,
       const base::Callback
           <void(scoped_ptr<Action::ActionVector>)>& callback) OVERRIDE;
 
   virtual void Close() OVERRIDE;
 
   // Gets or sets the amount of time that old records are kept in the database.
   const base::TimeDelta& retention_time() const { return retention_time_; }
   void set_retention_time(const base::TimeDelta& delta) {
     retention_time_ = delta;
   }
@@ skipping 23 matching lines @@
   // incremented in the database.
   typedef std::map<scoped_refptr<Action>, int, ActionComparatorExcludingTime>
       ActionQueue;
 
   // Adds an Action to those to be written out; this is an internal method used
   // by ProcessAction and is called on the database thread.
   void QueueAction(scoped_refptr<Action> action);
 
   // Internal method to read data from the database; called on the database
   // thread.
-  scoped_ptr<Action::ActionVector> DoReadData(
-      const std::string& extension_id,
-      const int days_ago);
-
-  // Internal method to read data from the database; called on the database
-  // thread.
   scoped_ptr<Action::ActionVector> DoReadFilteredData(
       const std::string& extension_id,
       const Action::ActionType type,
       const std::string& api_name,
       const std::string& page_url,
-      const std::string& arg_url);
+      const std::string& arg_url,
+      const int days_ago);
 
   // The implementation of RemoveURLs; this must only run on the database
   // thread.
   void DoRemoveURLs(const std::vector<GURL>& restrict_urls);
 
   // The implementation of DeleteDatabase; called on the database thread.
   void DoDeleteDatabase();
 
   // Cleans old records from the activity log database.
   bool CleanOlderThan(sql::Connection* db, const base::Time& cutoff);
@@ skipping 34 matching lines @@
 
   friend class CountingPolicyTest;
   FRIEND_TEST_ALL_PREFIXES(CountingPolicyTest, EarlyFlush);
   FRIEND_TEST_ALL_PREFIXES(CountingPolicyTest, MergingAndExpiring);
   FRIEND_TEST_ALL_PREFIXES(CountingPolicyTest, StringTableCleaning);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_COUNTING_POLICY_H_