| Index: chrome/test/base/browser_with_test_window_test.cc
|
| diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
|
| index 781182362b1d52249f3600672195bf8fb6c828ba..f831e228146af20e8cb2e86ad8acb5f336cade03 100644
|
| --- a/chrome/test/base/browser_with_test_window_test.cc
|
| +++ b/chrome/test/base/browser_with_test_window_test.cc
|
| @@ -38,19 +38,11 @@ using content::RenderFrameHostTester;
|
| using content::WebContents;
|
|
|
| BrowserWithTestWindowTest::BrowserWithTestWindowTest()
|
| - : browser_type_(Browser::TYPE_TABBED),
|
| - host_desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),
|
| - hosted_app_(false) {
|
| -}
|
| + : BrowserWithTestWindowTest(Browser::TYPE_TABBED, false) {}
|
|
|
| -BrowserWithTestWindowTest::BrowserWithTestWindowTest(
|
| - Browser::Type browser_type,
|
| - chrome::HostDesktopType host_desktop_type,
|
| - bool hosted_app)
|
| - : browser_type_(browser_type),
|
| - host_desktop_type_(host_desktop_type),
|
| - hosted_app_(hosted_app) {
|
| -}
|
| +BrowserWithTestWindowTest::BrowserWithTestWindowTest(Browser::Type browser_type,
|
| + bool hosted_app)
|
| + : browser_type_(browser_type), hosted_app_(hosted_app) {}
|
|
|
| BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
|
| }
|
| @@ -78,8 +70,8 @@ void BrowserWithTestWindowTest::SetUp() {
|
| // is responsible for cleaning it up (usually by NativeWidget destruction).
|
| window_.reset(CreateBrowserWindow());
|
|
|
| - browser_.reset(CreateBrowser(profile(), browser_type_, hosted_app_,
|
| - host_desktop_type_, window_.get()));
|
| + browser_.reset(
|
| + CreateBrowser(profile(), browser_type_, hosted_app_, window_.get()));
|
| }
|
|
|
| void BrowserWithTestWindowTest::TearDown() {
|
| @@ -230,7 +222,6 @@ Browser* BrowserWithTestWindowTest::CreateBrowser(
|
| Profile* profile,
|
| Browser::Type browser_type,
|
| bool hosted_app,
|
| - chrome::HostDesktopType host_desktop_type,
|
| BrowserWindow* browser_window) {
|
| Browser::CreateParams params(profile);
|
| if (hosted_app) {
|
|
|