| Index: chrome/test/base/browser_with_test_window_test.cc
|
| ===================================================================
|
| --- chrome/test/base/browser_with_test_window_test.cc (revision 145001)
|
| +++ chrome/test/base/browser_with_test_window_test.cc (working copy)
|
| @@ -7,6 +7,7 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "chrome/browser/profiles/profile_destroyer.h"
|
| #include "chrome/browser/ui/browser_navigator.h"
|
| +#include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/common/render_messages.h"
|
| @@ -137,14 +138,15 @@
|
| }
|
|
|
| void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) {
|
| - NavigateAndCommit(&browser()->GetActiveWebContents()->GetController(), url);
|
| + NavigateAndCommit(&chrome::GetActiveWebContents(browser())->GetController(),
|
| + url);
|
| }
|
|
|
| void BrowserWithTestWindowTest::DestroyBrowserAndProfile() {
|
| if (browser_.get()) {
|
| // Make sure we close all tabs, otherwise Browser isn't happy in its
|
| // destructor.
|
| - browser()->CloseAllTabs();
|
| + chrome::CloseAllTabs(browser());
|
| browser_.reset(NULL);
|
| }
|
| window_.reset(NULL);
|
|
|