Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3222)

Unified Diff: chrome/browser/extensions/activity_log/activity_log_unittest.cc

Issue 15573003: New architecture of the activity logging: Policies for summarization (and compression) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed browser test. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/activity_log/activity_log_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index 93f483a21b848771d666abe540c443057e802428..64b7d4da5011ff5c8486fa0a2d0fc9728334e5cb 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -237,7 +237,7 @@ TEST_F(ActivityLogTest, LogWithoutArguments) {
ActivityLog* activity_log = ActivityLog::GetInstance(profile_.get());
activity_log->SetArgumentLoggingForTesting(false);
ASSERT_TRUE(activity_log->IsLogEnabled());
-
+ activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_NOARGS);
scoped_ptr<ListValue> args(new ListValue());
args->Set(0, new base::StringValue("hello"));
args->Set(1, new base::StringValue("world"));
@@ -249,6 +249,7 @@ TEST_F(ActivityLogTest, LogWithoutArguments) {
TEST_F(ActivityLogTest, LogWithArguments) {
ActivityLog* activity_log = ActivityLog::GetInstance(profile_.get());
+ activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_FULLSTREAM);
ASSERT_TRUE(activity_log->IsLogEnabled());
scoped_ptr<ListValue> args(new ListValue());
@@ -272,6 +273,7 @@ TEST_F(RenderViewActivityLogTest, LogPrerender) {
.Build();
extension_service_->AddExtension(extension.get());
ActivityLog* activity_log = ActivityLog::GetInstance(profile());
+ activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_FULLSTREAM);
ASSERT_TRUE(activity_log->IsLogEnabled());
GURL url("http://www.google.com");

Powered by Google App Engine
This is Rietveld 408576698