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

Side by Side Diff: chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc

Issue 45733012: Disable ActivityLogApiTest.TriggerEvent while waiting for Blink roll (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 private: 45 private:
46 CommandLine saved_cmdline_; 46 CommandLine saved_cmdline_;
47 }; 47 };
48 48
49 #if defined(OS_WIN) && !defined(NDEBUG) 49 #if defined(OS_WIN) && !defined(NDEBUG)
50 // TODO(karenlees): fix flakiness on win debug - crbug.com/299393 50 // TODO(karenlees): fix flakiness on win debug - crbug.com/299393
51 #define MAYBE_TriggerEvent DISABLED_TriggerEvent 51 #define MAYBE_TriggerEvent DISABLED_TriggerEvent
52 #else 52 #else
53 #define MAYBE_TriggerEvent TriggerEvent 53 // Disabled while waiting for Blink roll to avoid https://codereview.chromium.or g/52203002
felt 2013/10/30 14:24:55 nit: line wrap
54 #define MAYBE_TriggerEvent DISABLED_TriggerEvent
54 #endif 55 #endif
55 56
56 // The test extension sends a message to its 'friend'. The test completes 57 // The test extension sends a message to its 'friend'. The test completes
57 // if it successfully sees the 'friend' receive the message. 58 // if it successfully sees the 'friend' receive the message.
58 IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) { 59 IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) {
59 ActivityLog::GetInstance(profile())->SetWatchdogAppActive(true); 60 ActivityLog::GetInstance(profile())->SetWatchdogAppActive(true);
60 61
61 host_resolver()->AddRule("*", "127.0.0.1"); 62 host_resolver()->AddRule("*", "127.0.0.1");
62 ASSERT_TRUE(StartEmbeddedTestServer()); 63 ASSERT_TRUE(StartEmbeddedTestServer());
63 embedded_test_server()->RegisterRequestHandler( 64 embedded_test_server()->RegisterRequestHandler(
64 base::Bind(&ActivityLogApiTest::HandleRequest, base::Unretained(this))); 65 base::Bind(&ActivityLogApiTest::HandleRequest, base::Unretained(this)));
65 66
66 const Extension* friend_extension = LoadExtensionIncognito( 67 const Extension* friend_extension = LoadExtensionIncognito(
67 test_data_dir_.AppendASCII("activity_log_private/friend")); 68 test_data_dir_.AppendASCII("activity_log_private/friend"));
68 ASSERT_TRUE(friend_extension); 69 ASSERT_TRUE(friend_extension);
69 ASSERT_TRUE(RunExtensionTest("activity_log_private/test")); 70 ASSERT_TRUE(RunExtensionTest("activity_log_private/test"));
70 ActivityLog::GetInstance(profile())->SetWatchdogAppActive(false); 71 ActivityLog::GetInstance(profile())->SetWatchdogAppActive(false);
71 } 72 }
72 73
73 } // namespace extensions 74 } // namespace extensions
74 75
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698