summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 12:51:43 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 12:51:43 +0000
commit932455407a6870e79bdf04615121b6a9a1766f01 (patch)
treedbd17fc73d7e99c620690f7324fdb5c5905d5e67 /chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
parentdb43338a7e82ebf6dfcc9555d794a5990a426781 (diff)
downloadchromium_src-932455407a6870e79bdf04615121b6a9a1766f01.zip
chromium_src-932455407a6870e79bdf04615121b6a9a1766f01.tar.gz
chromium_src-932455407a6870e79bdf04615121b6a9a1766f01.tar.bz2
[test fixlet] Add tests for ZoomBubbleGTK.
TEST=ZoomBubbleGtkTest.* pass on bots. BUG=None Review URL: https://chromiumcodereview.appspot.com/11032028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc')
-rw-r--r--chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc b/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
index 19226fe..53b3fe9 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
@@ -128,9 +128,9 @@ IN_PROC_BROWSER_TEST_F(LocationBarViewGtkZoomTest, ZoomInTwiceAndReset) {
ZoomIn();
int zoom_level = GetZoomPercent(contents);
ZoomIn();
- DCHECK_GT(GetZoomPercent(contents), zoom_level);
-
+ EXPECT_GT(GetZoomPercent(contents), zoom_level);
ExpectZoomedIn(contents);
+
EXPECT_TRUE(ZoomIconIsShowing());
ExpectIconIsResource(IDR_ZOOM_PLUS);
ExpectTooltipContainsZoom();
@@ -160,8 +160,9 @@ IN_PROC_BROWSER_TEST_F(LocationBarViewGtkZoomTest, ZoomOutTwiceAndReset) {
ZoomOut();
int zoom_level = GetZoomPercent(contents);
ZoomOut();
- DCHECK_LT(GetZoomPercent(contents), zoom_level);
+ EXPECT_LT(GetZoomPercent(contents), zoom_level);
ExpectZoomedOut(contents);
+
EXPECT_TRUE(ZoomIconIsShowing());
ExpectIconIsResource(IDR_ZOOM_MINUS);
ExpectTooltipContainsZoom();