diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 00:03:12 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 00:03:12 +0000 |
| commit | c36000e00d75b51321a18aff9260ee7f66f2b54e (patch) | |
| tree | 0edd7507571527900e040bc9fccfb2c1411320e4 /chrome/test/base/in_process_browser_test.cc | |
| parent | b3a259b88b030ec2786bd13a7dc79a951d7e4fb7 (diff) | |
| download | chromium_src-c36000e00d75b51321a18aff9260ee7f66f2b54e.zip chromium_src-c36000e00d75b51321a18aff9260ee7f66f2b54e.tar.gz chromium_src-c36000e00d75b51321a18aff9260ee7f66f2b54e.tar.bz2 | |
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
Diffstat (limited to 'chrome/test/base/in_process_browser_test.cc')
| -rw-r--r-- | chrome/test/base/in_process_browser_test.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 6b842dd..e135331 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -39,6 +39,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_launcher.h" +#include "content/public/test/test_navigation_observer.h" #include "net/base/mock_host_resolver.h" #include "net/test/test_server.h" #include "ui/compositor/compositor_switches.h" @@ -212,10 +213,15 @@ void InProcessBrowserTest::AddTabAtIndexToBrowser( int index, const GURL& url, content::PageTransition transition) { + content::TestNavigationObserver observer( + content::NotificationService::AllSources(), NULL, 1); + chrome::NavigateParams params(browser, url, transition); params.tabstrip_index = index; params.disposition = NEW_FOREGROUND_TAB; chrome::Navigate(¶ms); + + observer.Wait(); } void InProcessBrowserTest::AddTabAtIndex( |