diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 15:23:08 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 15:23:08 +0000 |
| commit | 4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c (patch) | |
| tree | e2f495edbb471c545155e2421495500da7ef52d4 /chrome/browser/crash_recovery_browsertest.cc | |
| parent | 075ee36cf9db4bf2c83cb1d95baf3ffb9faeda99 (diff) | |
| download | chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.zip chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.tar.gz chromium_src-4a63e24958ec6d3c84d1eb4d8bba73db21af0a3c.tar.bz2 | |
Clean up TCW, make it solely a hub for 1:1 observer/helper objects.
BUG=105872
TEST=no functional change
Review URL: http://codereview.chromium.org/8892011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/crash_recovery_browsertest.cc')
| -rw-r--r-- | chrome/browser/crash_recovery_browsertest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 0bbb485..3d644a3 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -9,6 +9,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/page_transition_types.h" @@ -31,7 +32,7 @@ class CrashRecoveryBrowserTest : public InProcessBrowserTest { }; // Test that reload works after a crash. -// Disabled, http://crbug.com/29331, http://crbug.com/69637. +// Disabled, http://crbug.com/29331 , http://crbug.com/69637 . IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) { // The title of the active tab should change each time this URL is loaded. GURL url( @@ -47,7 +48,8 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetSelectedTabContentsWrapper()->controller())); + &browser()->GetSelectedTabContentsWrapper()->tab_contents()-> + controller())); browser()->Reload(CURRENT_TAB); observer.Wait(); ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), @@ -76,7 +78,8 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetSelectedTabContentsWrapper()->controller())); + &browser()->GetSelectedTabContentsWrapper()->tab_contents()-> + controller())); browser()->Reload(CURRENT_TAB); observer.Wait(); ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), |