summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-21 12:59:36 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-21 12:59:36 +0000
commitcead7ee37b1c9f0597c5033f6593901c14865283 (patch)
treec288189b135bd407e12278ea7e7c05d7ecc845be /chrome/browser
parent8f5167bbe079a555d616586de7aa021e6ff26d3a (diff)
downloadchromium_src-cead7ee37b1c9f0597c5033f6593901c14865283.zip
chromium_src-cead7ee37b1c9f0597c5033f6593901c14865283.tar.gz
chromium_src-cead7ee37b1c9f0597c5033f6593901c14865283.tar.bz2
I'm only seeing half the traces I added to the file, which by looking at the code is impossible (HasSuspiciousExtensions() is always called before calling GetSuspiciousExtensionNames()). I'm wondering if the process crashing (via CHECK) is interfering with the traces. Let's test that hypothesis.
BUG=321622 TBR=kjellander Review URL: https://codereview.chromium.org/80873002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc
index a2ed903..f16d87b 100644
--- a/chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc
@@ -200,8 +200,9 @@ TEST_F(SuspiciousExtensionBubbleTest, MAYBE_ControllerTest) {
controller.reset(new TestSuspiciousExtensionBubbleController(profile_.get()));
DCHECK(controller->HasSuspiciousExtensions());
suspicious_extensions = controller->GetSuspiciousExtensionNames();
- CHECK_EQ(1U, suspicious_extensions.size());
- DCHECK(ASCIIToUTF16("Extension 1") == suspicious_extensions[0]);
+ DCHECK_EQ(1U, suspicious_extensions.size());
+ if (suspicious_extensions.size() == 1U)
+ DCHECK(ASCIIToUTF16("Extension 1") == suspicious_extensions[0]);
controller->Show(&bubble); // Simulate showing the bubble.
DCHECK_EQ(0U, controller->link_click_count());
DCHECK_EQ(1U, controller->dismiss_click_count());
@@ -221,9 +222,11 @@ TEST_F(SuspiciousExtensionBubbleTest, MAYBE_ControllerTest) {
controller.reset(new TestSuspiciousExtensionBubbleController(profile_.get()));
DCHECK(controller->HasSuspiciousExtensions());
suspicious_extensions = controller->GetSuspiciousExtensionNames();
- CHECK_EQ(2U, suspicious_extensions.size());
- DCHECK(ASCIIToUTF16("Extension 1") == suspicious_extensions[1]);
- DCHECK(ASCIIToUTF16("Extension 2") == suspicious_extensions[0]);
+ DCHECK_EQ(2U, suspicious_extensions.size());
+ if (suspicious_extensions.size() == 2U) {
+ DCHECK(ASCIIToUTF16("Extension 1") == suspicious_extensions[1]);
+ DCHECK(ASCIIToUTF16("Extension 2") == suspicious_extensions[0]);
+ }
controller->Show(&bubble); // Simulate showing the bubble.
DCHECK_EQ(1U, controller->link_click_count());
DCHECK_EQ(0U, controller->dismiss_click_count());