Remove HostDesktopType from interactive_test_utils_win

chrome/test/base/interactive_test_utils_win.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/interactive_test_utils.h"
 
 #include <Psapi.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
-#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/test/base/interactive_test_utils_aura.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/base/win/foreground_helper.h"
 #include "ui/views/focus/focus_manager.h"
 
 namespace ui_test_utils {
 
 void HideNativeWindow(gfx::NativeWindow window) {
-  if (chrome::GetHostDesktopTypeForNativeWindow(window) ==
-      chrome::HOST_DESKTOP_TYPE_ASH) {
-    HideNativeWindowAura(window);
-    return;
-  }
+#if defined(USE_ASH)
+  HideNativeWindowAura(window);
+  return;
+#endif  // USE_ASH

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

#else here and below.

[scottmg, 2016/02/17 05:36:32]

Done here, one below wasn't a return, just ash-specific.

   HWND hwnd = window->GetHost()->GetAcceleratedWidget();
   ::ShowWindow(hwnd, SW_HIDE);
 }
 
 bool ShowAndFocusNativeWindow(gfx::NativeWindow window) {
-  if (chrome::GetHostDesktopTypeForNativeWindow(window) ==
-      chrome::HOST_DESKTOP_TYPE_ASH)
-    ShowAndFocusNativeWindowAura(window);
+#if defined(USE_ASH)
+  ShowAndFocusNativeWindowAura(window);
+#endif  // USE_ASH
   window->Show();
   // Always make sure the window hosting ash is visible and focused.
   HWND hwnd = window->GetHost()->GetAcceleratedWidget();
 
   ::ShowWindow(hwnd, SW_SHOW);
 
   if (GetForegroundWindow() != hwnd) {
     VLOG(1) << "Forcefully refocusing front window";
     ui::ForegroundHelper::SetForeground(hwnd);
   }
@@ skipping 20 matching lines @@
     }
   }
   GetWindowText(foreground_window, window_title, arraysize(window_title));
   LOG(ERROR) << "ShowAndFocusNativeWindow failed. foreground window: "
              << foreground_window << ", title: " << window_title << ", path: "
              << path_str;
   return false;
 }
 
 }  // namespace ui_test_utils