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

Unified Diff: chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc

Issue 2251213004: Moves ImmersiveFullscreenController::SetupForTest into test class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 4 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/views/location_bar/zoom_bubble_view_browsertest.cc
diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc b/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc
index 5e0e2081025ef56239f1f9c0af1082610d79fbec..2a5ad37c334f9652a38673cc2e46b3d0450f5ab2 100644
--- a/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc
@@ -14,6 +14,11 @@
typedef InProcessBrowserTest ZoomBubbleBrowserTest;
+#if defined(USE_ASH)
+#include "ash/test/immersive_fullscreen_controller_test_api.h"
+#include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
+#endif
+
// TODO(linux_aura) http://crbug.com/163931
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
#define MAYBE_NonImmersiveFullscreen DISABLED_NonImmersiveFullscreen
@@ -74,7 +79,11 @@ IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, ImmersiveFullscreen) {
ImmersiveModeController* immersive_controller =
browser_view->immersive_mode_controller();
- immersive_controller->SetupForTest();
+ ASSERT_EQ(ImmersiveModeController::Type::ASH, immersive_controller->type());
+ ash::ImmersiveFullscreenControllerTestApi(
+ static_cast<ImmersiveModeControllerAsh*>(immersive_controller)
+ ->controller())
+ .SetupForTest();
// Enter immersive fullscreen.
{

Powered by Google App Engine
This is Rietveld 408576698