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

Side by Side 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, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "chrome/browser/extensions/activity_log/activity_log.h" 7 #include "chrome/browser/extensions/activity_log/activity_log.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/common/extensions/extension_builder.h" 10 #include "chrome/common/extensions/extension_builder.h"
(...skipping 24 matching lines...) Expand all
35 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) 35 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
36 // TODO(karenlees): test flaky on windows. See Bug: crbug.com/245594 36 // TODO(karenlees): test flaky on windows. See Bug: crbug.com/245594
37 #define MAYBE_TriggerEvent DISABLED_TriggerEvent 37 #define MAYBE_TriggerEvent DISABLED_TriggerEvent
38 #else 38 #else
39 #define MAYBE_TriggerEvent TriggerEvent 39 #define MAYBE_TriggerEvent TriggerEvent
40 #endif 40 #endif
41 41
42 // The test extension sends a message to its 'friend'. The test completes 42 // The test extension sends a message to its 'friend'. The test completes
43 // if it successfully sees the 'friend' receive the message. 43 // if it successfully sees the 'friend' receive the message.
44 IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) { 44 IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) {
45 ActivityLog::GetInstance(profile())->SetWatchdogAppActive(true);
45 host_resolver()->AddRule("*", "127.0.0.1"); 46 host_resolver()->AddRule("*", "127.0.0.1");
46 const Extension* friend_extension = LoadExtensionIncognito( 47 const Extension* friend_extension = LoadExtensionIncognito(
47 test_data_dir_.AppendASCII("activity_log_private/friend")); 48 test_data_dir_.AppendASCII("activity_log_private/friend"));
48 ASSERT_TRUE(friend_extension); 49 ASSERT_TRUE(friend_extension);
49 ASSERT_TRUE(RunExtensionTest("activity_log_private/test")); 50 ASSERT_TRUE(RunExtensionTest("activity_log_private/test"));
51 ActivityLog::GetInstance(profile())->SetWatchdogAppActive(false);
50 } 52 }
51 53
52 } // namespace extensions 54 } // namespace extensions
53 55
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698