diff options
| author | davve@opera.com <davve@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 11:59:30 +0000 |
|---|---|---|
| committer | davve@opera.com <davve@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 11:59:30 +0000 |
| commit | 2fee587449f8c6a42184bc056852dcd6606cad51 (patch) | |
| tree | 7f104bc1ae0d6cde557224ddcc021ca82cb56391 /chrome/browser/extensions | |
| parent | e1edf8a35099b75a0d9a7d767600acaa31535d3b (diff) | |
| download | chromium_src-2fee587449f8c6a42184bc056852dcd6606cad51.zip chromium_src-2fee587449f8c6a42184bc056852dcd6606cad51.tar.gz chromium_src-2fee587449f8c6a42184bc056852dcd6606cad51.tar.bz2 | |
Enable ActivityLogApiTest.TriggerEvent and update test
Blink rev has been rolled to r161048, which includes the innerHTML
move from HTMLElement to Element. Update and enable the test that had
to be disabled during the transition.
BUG=311080
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=232385
Review URL: https://codereview.chromium.org/54933002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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 4903390..acfff92 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 @@ -50,9 +50,7 @@ class ActivityLogApiTest : public ExtensionApiTest { // TODO(karenlees): fix flakiness on win debug - crbug.com/299393 #define MAYBE_TriggerEvent DISABLED_TriggerEvent #else -// Disabled while waiting for Blink roll to avoid -// https://codereview.chromium.org/52203002 -#define MAYBE_TriggerEvent DISABLED_TriggerEvent +#define MAYBE_TriggerEvent TriggerEvent #endif // The test extension sends a message to its 'friend'. The test completes |