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

Unified Diff: chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc

Issue 23729005: Enable Activity Logging by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added definition of 'active' Created 7 years, 4 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/api/activity_log_private/activity_log_private_apitest.cc
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
index f6bf48e4f776e08c34b1704473e06f69b73692de..fbe7483df809d974c286a9a06e2a2d334515a20a 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
@@ -42,11 +42,13 @@ class ActivityLogApiTest : public ExtensionApiTest {
// The test extension sends a message to its 'friend'. The test completes
// if it successfully sees the 'friend' receive the message.
IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) {
+ ActivityLog::GetInstance(profile())->SetWatchdogAppActive(true);
host_resolver()->AddRule("*", "127.0.0.1");
const Extension* friend_extension = LoadExtensionIncognito(
test_data_dir_.AppendASCII("activity_log_private/friend"));
ASSERT_TRUE(friend_extension);
ASSERT_TRUE(RunExtensionTest("activity_log_private/test"));
+ ActivityLog::GetInstance(profile())->SetWatchdogAppActive(false);
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698