Add functions to clean URLs from the activity log

chrome/browser/extensions/activity_log/counting_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/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 176 matching lines @@
         "ID=punky CATEGORY=api_call API=brewster COUNT=%d", count);
     if (count > 0) {
       ASSERT_EQ(1u, actions->size());
       ASSERT_EQ(api_print, actions->at(0)->PrintForDebug());
       ASSERT_EQ(time, actions->at(0)->time());
     } else {
       ASSERT_EQ(0u, actions->size());
     }
   }
 
+  static void AllURLsRemoved(scoped_ptr<Action::ActionVector> actions) {
+    std::string action_urls_cleared =
+        "ID=punky CATEGORY=dom_access API=lets ARGS=[\"vamoose\"] COUNT=1";
+    ASSERT_EQ(2, static_cast<int>(actions->size()));
+    ASSERT_EQ(action_urls_cleared, actions->at(0)->PrintForDebug());
+    ASSERT_EQ(action_urls_cleared, actions->at(1)->PrintForDebug());
+  }
+
+  static void SomeURLsRemoved(scoped_ptr<Action::ActionVector> actions) {
+    std::string action_urls_not_cleared =
+        "ID=punky CATEGORY=dom_access API=lets ARGS=[\"vamoose\"] "
+        "PAGE_URL=http://www.google.com/ PAGE_TITLE=\"Google\" "
+        "ARG_URL=http://www.google.com/ COUNT=1";
+    std::string action_urls_cleared =
+        "ID=punky CATEGORY=dom_access API=lets ARGS=[\"vamoose\"] COUNT=1";
+    ASSERT_EQ(3, static_cast<int>(actions->size()));
+    ASSERT_EQ(action_urls_cleared, actions->at(0)->PrintForDebug());
+    ASSERT_EQ(action_urls_cleared, actions->at(1)->PrintForDebug());
+    ASSERT_EQ(action_urls_not_cleared, actions->at(2)->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
   // TearDown().
   CommandLine saved_cmdline_;
 
@@ skipping 358 matching lines @@
 
   CheckReadData(
       policy,
       "punky",
       0,
       base::Bind(
           &CountingPolicyTest::Arguments_CheckMergeCountAndTime, 3, time5));
   policy->Close();
 }
 
+TEST_F(CountingPolicyTest, RemoveAllURLs) {
+  ActivityLogPolicy* policy = new CountingPolicy(profile_.get());
+
+  // Use a mock clock to ensure that events are not recorded on the wrong day
+  // when the test is run close to local midnight.
+  base::SimpleTestClock* mock_clock = new base::SimpleTestClock();
+  mock_clock->SetNow(base::Time::Now().LocalMidnight() +
+                     base::TimeDelta::FromHours(12));
+  policy->SetClockForTesting(scoped_ptr<base::Clock>(mock_clock));
+
+  // Record some actions
+  scoped_refptr<Action> action =
+      new Action("punky", mock_clock->Now(),

[mvrable, 2013/08/26 18:14:57]

When data is read from the database in CheckReadData, values are sorted by time
(from most recent to oldest).  All Actions that you are inserting have the same
time value (mock_clock->Now()), so the order of the values when read back is
indeterminate--but the checking code assumes the values come back in a specific
order.

I'd use a different time value for each action, so you have a dependable
ordering.

[karenlees, 2013/08/26 22:58:36]

Done.

+                 Action::ACTION_DOM_ACCESS, "lets");
+  action->mutable_args()->AppendString("vamoose");
+  action->set_page_url(GURL("http://www.google.com"));
+  action->set_page_title("Google");
+  action->set_arg_url(GURL("http://www.google.com"));
+  policy->ProcessAction(action);
+
+  action = new Action(
+      "punky", mock_clock->Now(), Action::ACTION_DOM_ACCESS, "lets");
+  action->mutable_args()->AppendString("vamoose");
+  action->set_page_url(GURL("http://www.google2.com"));
+  action->set_page_title("Google");
+  action->set_arg_url(GURL("http://www.google2.com"));
+  policy->ProcessAction(action);
+
+  // Clean all the URLs.
+  std::vector<GURL> no_url_restrictions;
+  policy->RemoveURLs(no_url_restrictions);
+
+  CheckReadData(
+      policy,
+      "punky",
+      0,
+      base::Bind(&CountingPolicyTest::AllURLsRemoved));
+  policy->Close();
+}
+
+TEST_F(CountingPolicyTest, RemoveSpecificURLs) {
+  ActivityLogPolicy* policy = new CountingPolicy(profile_.get());
+
+  // Use a mock clock to ensure that events are not recorded on the wrong day
+  // when the test is run close to local midnight.
+  base::SimpleTestClock* mock_clock = new base::SimpleTestClock();
+  mock_clock->SetNow(base::Time::Now().LocalMidnight() +
+                     base::TimeDelta::FromHours(12));
+  policy->SetClockForTesting(scoped_ptr<base::Clock>(mock_clock));
+
+  // Record some actions
+  scoped_refptr<Action> action =
+      new Action("punky", mock_clock->Now(), Action::ACTION_DOM_ACCESS, "lets");
+  action->mutable_args()->AppendString("vamoose");
+  action->set_page_url(GURL("http://www.google1.com"));
+  action->set_page_title("Google");
+  action->set_arg_url(GURL("http://www.google.com"));
+  policy->ProcessAction(action);
+
+  action = new Action(
+      "punky", mock_clock->Now(), Action::ACTION_DOM_ACCESS, "lets");
+  action->mutable_args()->AppendString("vamoose");
+  action->set_page_url(GURL("http://www.google2.com"));
+  action->set_page_title("Google");
+  action->set_arg_url(GURL("http://www.google2.com"));
+  policy->ProcessAction(action);
+
+  action = new Action(
+      "punky", mock_clock->Now(), Action::ACTION_DOM_ACCESS, "lets");
+  action->mutable_args()->AppendString("vamoose");
+  action->set_page_url(GURL("http://www.google.com"));
+  action->set_page_title("Google");

[mvrable, 2013/08/26 18:14:57]

Missing a action->set_arg_url(GURL("http://www.google2.com")) here?  The
comparison seems to expect arg_url to be set.

[karenlees, 2013/08/26 22:58:36]

This was deliberate to make sure the sql statement still works if the arg_url is
missing.  If the others passed and this failed I needed to make two calls to
handle the null values in the OR statement correctly. Is it possible for there
to be an arg_url without a page_url?  If so, I'll add a test for that too.

+  policy->ProcessAction(action);
+
+  // Clean some URLs.
+  std::vector<GURL> urls;
+  urls.push_back(GURL("http://www.google1.com"));
+  urls.push_back(GURL("http://www.google2.com"));
+  urls.push_back(GURL("http://www.url_not_in_db.com"));
+  policy->RemoveURLs(urls);
+
+  CheckReadData(
+      policy,
+      "punky",
+      0,
+      base::Bind(&CountingPolicyTest::SomeURLsRemoved));
+  policy->Close();
+}
+
 }  // namespace extensions