From c36000e00d75b51321a18aff9260ee7f66f2b54e Mon Sep 17 00:00:00 2001 From: "scheib@chromium.org" Date: Sat, 10 Nov 2012 00:03:12 +0000 Subject: Refactor Fullscreen Controller State Machine tests to Interactive tests and Unit Tests. Previously the state machine tests ran only as unit tests, and were not verified against actual operating system window behavior. R=yzshen, phajdan.jr chrome/browser/ui/fullscreen/*, chrome/test/base/in_process_browser_test.cc TBR=ben chrome/chrome_tests.gypi & chrome/browser/ui/cocoa/browser_window_controller.mm BUG=146666 Review URL: https://chromiumcodereview.appspot.com/11264021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167011 0039d316-1c4b-4281-b951-d872f2087c98 --- .../ui/fullscreen/fullscreen_controller_browsertest.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc') diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc index a154431..c9da148 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc @@ -19,17 +19,17 @@ #include "base/mac/mac_util.h" #endif +using chrome::kAboutBlankURL; using content::WebContents; +using content::PAGE_TRANSITION_TYPED; class FullscreenControllerBrowserTest: public FullscreenControllerTest { }; IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, PendingMouseLockExitsOnTabSwitch) { - AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED); - AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); WebContents* tab1 = chrome::GetActiveWebContents(browser()); // Request mouse lock. Bubble is displayed. @@ -62,10 +62,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, PendingMouseLockExitsOnTabClose) { // Add more tabs. - AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED); - AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); // Request mouse lock. Bubble is displayed. RequestToLockMouse(true, false); -- cgit v1.1