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

Unified Diff: chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc

Issue 877413004: Refactor away the Browser* dependency in exclusive_access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken mac change Created 5 years, 10 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/exclusive_access/fullscreen_controller_state_unittest.cc
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
index 31ef25230b0fbaa2a3070651f3c1c6f741c8da47..28e7c274c30ae1a0b8edf832695a7459c5573b57 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
@@ -6,6 +6,7 @@
#include "build/build_config.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
#include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -23,7 +24,8 @@
// A BrowserWindow used for testing FullscreenController. The behavior of this
// mock is verfied manually by running FullscreenControllerStateInteractiveTest.
-class FullscreenControllerTestWindow : public TestBrowserWindow {
+class FullscreenControllerTestWindow : public TestBrowserWindow,
+ ExclusiveAccessContext {
public:
// Simulate the window state with an enumeration.
enum WindowState {
@@ -55,6 +57,16 @@ class FullscreenControllerTestWindow : public TestBrowserWindow {
static const char* GetWindowStateString(WindowState state);
WindowState state() const { return state_; }
void set_browser(Browser* browser) { browser_ = browser; }
+ ExclusiveAccessContext* GetExclusiveAccessContext() override;
+
+ // ExclusiveAccessContext Interface:
+ Profile* GetProfile() override;
+ content::WebContents* GetActiveWebContents() override;
+ void HideDownloadShelf() override;
+ void UnhideDownloadShelf() override;
+ void UpdateExclusiveAccessExitBubbleContent(
+ const GURL& url,
+ ExclusiveAccessBubbleType bubble_type) override;
// Simulates the window changing state.
void ChangeWindowFullscreenState();
@@ -205,6 +217,32 @@ bool FullscreenControllerTestWindow::IsTransitionReentrant(
mac_with_toolbar_mode_changed;
}
+ExclusiveAccessContext*
+FullscreenControllerTestWindow::GetExclusiveAccessContext() {
+ return this;
+}
+
+Profile* FullscreenControllerTestWindow::GetProfile() {
+ return browser_->profile();
+}
+
+content::WebContents* FullscreenControllerTestWindow::GetActiveWebContents() {
+ return browser_->tab_strip_model()->GetActiveWebContents();
+}
+
+void FullscreenControllerTestWindow::UnhideDownloadShelf() {
+ GetDownloadShelf()->Unhide();
+}
+
+void FullscreenControllerTestWindow::HideDownloadShelf() {
+ GetDownloadShelf()->Hide();
+}
+
+void FullscreenControllerTestWindow::UpdateExclusiveAccessExitBubbleContent(
+ const GURL& url,
+ ExclusiveAccessBubbleType bubble_type) {
+ TestBrowserWindow::UpdateExclusiveAccessExitBubbleContent(url, bubble_type);
+}
// FullscreenControllerStateUnitTest -------------------------------------------
@@ -229,7 +267,7 @@ class FullscreenControllerStateUnitTest : public BrowserWithTestWindowTest,
FullscreenControllerTestWindow* window_;
};
-FullscreenControllerStateUnitTest::FullscreenControllerStateUnitTest ()
+FullscreenControllerStateUnitTest::FullscreenControllerStateUnitTest()
: window_(NULL) {
}
@@ -316,7 +354,6 @@ Browser* FullscreenControllerStateUnitTest::GetBrowser() {
return BrowserWithTestWindowTest::browser();
}
-
// Soak tests ------------------------------------------------------------------
// Tests all states with all permutations of multiple events to detect lingering

Powered by Google App Engine
This is Rietveld 408576698