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

Unified Diff: chrome/browser/ui/zoom/zoom_controller_unittest.cc

Issue 580133002: Update entry page type to include error pages when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Set page type, fix tests. Created 6 years, 3 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/zoom/zoom_controller_unittest.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller_unittest.cc b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
index 422a782c2249094cfc0077144bae9754f14fc7ab..06bdb167c53ef01ee7cb2cc070684c0ff251ab10 100644
--- a/chrome/browser/ui/zoom/zoom_controller_unittest.cc
+++ b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
@@ -94,12 +94,14 @@ TEST_F(ZoomControllerTest, Observe_ZoomController) {
double old_zoom_level = zoom_controller_->GetZoomLevel();
double new_zoom_level = 110.0;
+ NavigateAndCommit(GURL("about:blank"));
+
ZoomController::ZoomChangedEventData zoom_change_data1(
web_contents(),
old_zoom_level,
old_zoom_level,
ZoomController::ZOOM_MODE_ISOLATED,
- false /* can_show_bubble */);
+ true /* can_show_bubble */);
EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data1)).Times(1);
zoom_controller_->SetZoomMode(ZoomController::ZOOM_MODE_ISOLATED);
@@ -109,7 +111,7 @@ TEST_F(ZoomControllerTest, Observe_ZoomController) {
old_zoom_level,
new_zoom_level,
ZoomController::ZOOM_MODE_ISOLATED,
- false /* can_show_bubble */);
+ true /* can_show_bubble */);
EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data2)).Times(1);
zoom_controller_->SetZoomLevel(new_zoom_level);

Powered by Google App Engine
This is Rietveld 408576698