Index: chrome/test/base/browser_with_test_window_test.h |
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h |
index e23c920b41f9a399025ac7a022eabdb3563d7323..0c9a427e77d0f1ac03c6c500756229c23f93c92c 100644 |
--- a/chrome/test/base/browser_with_test_window_test.h |
+++ b/chrome/test/base/browser_with_test_window_test.h |
@@ -72,8 +72,8 @@ class BrowserWithTestWindowTest : public testing::Test { |
virtual void TearDown() OVERRIDE; |
protected: |
- TestBrowserWindow* window() const { return window_.get(); } |
- void set_window(TestBrowserWindow* window) { |
+ BrowserWindow* window() const { return window_.get(); } |
+ void set_window(BrowserWindow* window) { |
window_.reset(window); |
} |
@@ -81,6 +81,9 @@ class BrowserWithTestWindowTest : public testing::Test { |
void set_browser(Browser* browser) { |
browser_.reset(browser); |
} |
+ Browser* release_browser() WARN_UNUSED_RESULT { |
+ return browser_.release(); |
+ } |
TestingProfile* profile() const { return profile_.get(); } |
void set_profile(TestingProfile* profile); |
@@ -129,7 +132,7 @@ class BrowserWithTestWindowTest : public testing::Test { |
content::TestBrowserThread file_user_blocking_thread_; |
scoped_ptr<TestingProfile> profile_; |
- scoped_ptr<TestBrowserWindow> window_; |
+ scoped_ptr<BrowserWindow> window_; // Usually a TestBrowserWindow. |
scoped_ptr<Browser> browser_; |
// The existence of this object enables tests via |