diff options
Diffstat (limited to 'chromium/weblayer/browser/url_bar')
-rw-r--r-- | chromium/weblayer/browser/url_bar/url_bar_browsertest.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chromium/weblayer/browser/url_bar/url_bar_browsertest.cc b/chromium/weblayer/browser/url_bar/url_bar_browsertest.cc index 76c39e11cd6..22dbd2092c3 100644 --- a/chromium/weblayer/browser/url_bar/url_bar_browsertest.cc +++ b/chromium/weblayer/browser/url_bar/url_bar_browsertest.cc @@ -8,6 +8,7 @@ #include "weblayer/browser/browser_impl.h" #include "weblayer/browser/profile_impl.h" #include "weblayer/browser/tab_impl.h" +#include "weblayer/shell/browser/shell.h" #include "weblayer/test/weblayer_browser_test.h" #include "weblayer/test/weblayer_browser_test_utils.h" @@ -22,16 +23,13 @@ class UrlBarBrowserTest : public WebLayerBrowserTest { void SetUpOnMainThread() override { WebLayerBrowserTest::SetUpOnMainThread(); ASSERT_TRUE(embedded_test_server()->Start()); - browser_ = Browser::Create(GetProfile(), nullptr); - tab_ = static_cast<TabImpl*>(browser_->AddTab(Tab::Create(GetProfile()))); - another_tab_ = - static_cast<TabImpl*>(browser_->AddTab(Tab::Create(GetProfile()))); - browser_->SetActiveTab(tab_); + tab_ = static_cast<TabImpl*>(shell()->browser()->CreateTab()); + another_tab_ = static_cast<TabImpl*>(shell()->browser()->CreateTab()); + SetActiveTab(tab_); } void PostRunTestOnMainThread() override { tab_ = nullptr; another_tab_ = nullptr; - browser_.reset(); WebLayerBrowserTest::PostRunTestOnMainThread(); } @@ -45,16 +43,15 @@ class UrlBarBrowserTest : public WebLayerBrowserTest { std::move(closure)); } - void SetActiveTab(TabImpl* tab) { browser_->SetActiveTab(tab); } + void SetActiveTab(TabImpl* tab) { shell()->browser()->SetActiveTab(tab); } protected: TabImpl* tab_ = nullptr; TabImpl* another_tab_ = nullptr; private: - std::unique_ptr<Browser> browser_; BrowserImpl* browser_impl() { - return static_cast<BrowserImpl*>(browser_.get()); + return static_cast<BrowserImpl*>(shell()->browser()); } }; |