| Index: chrome/browser/unload_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/unload_browsertest.cc (revision 145001)
|
| +++ chrome/browser/unload_browsertest.cc (working copy)
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| +#include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| @@ -128,7 +129,7 @@
|
|
|
| void CheckTitle(const char* expected_title) {
|
| string16 expected = ASCIIToUTF16(expected_title);
|
| - EXPECT_EQ(expected, browser()->GetActiveWebContents()->GetTitle());
|
| + EXPECT_EQ(expected, chrome::GetActiveWebContents(browser())->GetTitle());
|
| }
|
|
|
| void NavigateToDataURL(const std::string& html_content,
|
| @@ -275,7 +276,7 @@
|
| // the renderer.
|
| string16 expected_title = ASCIIToUTF16("cancelled");
|
| ui_test_utils::TitleWatcher title_watcher(
|
| - browser()->GetActiveWebContents(), expected_title);
|
| + chrome::GetActiveWebContents(browser()), expected_title);
|
| ClickModalDialogButton(false);
|
| ASSERT_EQ(expected_title, title_watcher.WaitAndGetTitle());
|
|
|
| @@ -390,7 +391,7 @@
|
| ui_test_utils::WindowedNotificationObserver load_stop_observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::NotificationService::AllSources());
|
| - ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents());
|
| + ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser()));
|
| observer.Wait();
|
| load_stop_observer.Wait();
|
| CheckTitle("popup");
|
|
|