summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authormlamouri <mlamouri@chromium.org>2015-06-30 18:29:53 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-01 01:30:55 +0000
commite41407ef687d627d932518435704b4fdd9e372fa (patch)
tree5ed962ae540ee4fc910e01208303897ede366d44 /chrome/chrome_tests.gypi
parent496fbdb3db72b78b757871e5855ec6cfb61a23ef (diff)
downloadchromium_src-e41407ef687d627d932518435704b4fdd9e372fa.zip
chromium_src-e41407ef687d627d932518435704b4fdd9e372fa.tar.gz
chromium_src-e41407ef687d627d932518435704b4fdd9e372fa.tar.bz2
Fix PermissionBubbleManager race conditions when merging requests on load.
The PermissionBubbleManager merges request that happened before the load event when the load event happens. This was actually broken because the boolean used was never reset to 0, even after the main frame was navigated. Note that it means that this feature was never really working so we might end up with permission prompts being delayed a lot because the load event takes too long to happen. BUG=434104 Review URL: https://codereview.chromium.org/1187923005 Cr-Commit-Position: refs/heads/master@{#336954}
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 98c85c2..fdfaab0 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -514,6 +514,7 @@
'browser/ui/website_settings/mock_permission_bubble_view.h',
'browser/ui/website_settings/permission_bubble_browser_test_util.cc',
'browser/ui/website_settings/permission_bubble_browser_test_util.h',
+ 'browser/ui/website_settings/permission_bubble_manager_browsertest.cc',
'browser/ui/webui/bidi_checker_web_ui_test.cc',
'browser/ui/webui/bidi_checker_web_ui_test.h',
'browser/ui/webui/bookmarks_ui_browsertest.cc',