Remove HostDesktopType from BrowserWithTestWindowTest

chrome/test/base/browser_with_test_window_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/browser_with_test_window_test.h"
 
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
 #include "components/constrained_window/constrained_window_views.h"
 #endif
 
 using content::NavigationController;
 using content::RenderFrameHost;
 using content::RenderFrameHostTester;
 using content::WebContents;
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
-    : browser_type_(Browser::TYPE_TABBED),
-      host_desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),
-      hosted_app_(false) {
-}
+    : browser_type_(Browser::TYPE_TABBED), hosted_app_(false) {}

[sky, 2016/02/16 02:59:04]

nit: use delegating constructors.

[scottmg, 2016/02/17 05:33:33]

Done.

 
-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() {
 }
 
 void BrowserWithTestWindowTest::SetUp() {
   testing::Test::SetUp();
 #if defined(OS_CHROMEOS)
   // TODO(jamescook): Windows Ash support. This will require refactoring
   // AshTestHelper and AuraTestHelper so they can be used at the same time,
   // perhaps by AshTestHelper owning an AuraTestHelper.
   ash_test_helper_.reset(new ash::test::AshTestHelper(
       base::MessageLoopForUI::current()));
   ash_test_helper_->SetUp(true);
 #elif defined(TOOLKIT_VIEWS)
   views_test_helper_.reset(new views::ScopedViewsTestHelper());
 #endif
 #if defined(TOOLKIT_VIEWS)
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
 #endif
 
   // Subclasses can provide their own Profile.
   profile_ = CreateProfile();
   // Subclasses can provide their own test BrowserWindow. If they return NULL
   // then Browser will create the a production BrowserWindow and the subclass
   // 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() {
   // Some tests end up posting tasks to the DB thread that must be completed
   // before the profile can be destroyed and the test safely shut down.
   base::RunLoop().RunUntilIdle();
 
   // Reset the profile here because some profile keyed services (like the
   // audio service) depend on test stubs that the helpers below will remove.
   DestroyBrowserAndProfile();
@@ skipping 130 matching lines @@
 }
 
 BrowserWindow* BrowserWithTestWindowTest::CreateBrowserWindow() {
   return new TestBrowserWindow();
 }
 
 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) {
     params = Browser::CreateParams::CreateForApp(
         "Test", true /* trusted_source */, gfx::Rect(), profile);
   } else {
     params.type = browser_type;
   }
   params.window = browser_window;
   return new Browser(params);
 }