Remove OS_CHROMEOS from ui/ash code

chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

 // Copyright 2015 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/browser/extensions/api/desktop_capture/desktop_capture_base.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/desktop_media_list_ash.h"
 #include "chrome/browser/media/desktop_streams_registry.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/native_desktop_media_list.h"
 #include "chrome/browser/media/tab_desktop_media_list.h"
-#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/common/channel_info.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/switches.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
 
@@ skipping 108 matching lines @@
         g_picker_factory->CreateModel(show_screens, show_windows, show_tabs,
                                       request_audio);
     screen_list = std::move(media_lists[0]);
     window_list = std::move(media_lists[1]);
     tab_list = std::move(media_lists[2]);
     picker_ = g_picker_factory->CreatePicker();
   } else {
     // Create a screens list.
     if (show_screens) {
 #if defined(USE_ASH)
-      if (chrome::IsNativeWindowInAsh(parent_window)) {
-        screen_list = base::WrapUnique(
-            new DesktopMediaListAsh(DesktopMediaListAsh::SCREENS));
-      }
+      screen_list = base::WrapUnique(
+          new DesktopMediaListAsh(DesktopMediaListAsh::SCREENS));
 #endif
       if (!screen_list) {
         webrtc::DesktopCaptureOptions options =
             webrtc::DesktopCaptureOptions::CreateDefault();
         options.set_disable_effects(false);
         std::unique_ptr<webrtc::ScreenCapturer> screen_capturer(
             webrtc::ScreenCapturer::Create(options));
 
         screen_list = base::WrapUnique(
             new NativeDesktopMediaList(std::move(screen_capturer), nullptr));
       }
     }
 
     // Create a windows list.
     if (show_windows) {
 #if defined(USE_ASH)
-      if (chrome::IsNativeWindowInAsh(parent_window)) {
-        window_list = base::WrapUnique(
-            new DesktopMediaListAsh(DesktopMediaListAsh::WINDOWS));
-      }
+      window_list = base::WrapUnique(
+          new DesktopMediaListAsh(DesktopMediaListAsh::WINDOWS));
 #endif
       if (!window_list) {
         webrtc::DesktopCaptureOptions options =
             webrtc::DesktopCaptureOptions::CreateDefault();
         options.set_disable_effects(false);
         std::unique_ptr<webrtc::WindowCapturer> window_capturer(
             webrtc::WindowCapturer::Create(options));
 
         window_list = base::WrapUnique(
             new NativeDesktopMediaList(nullptr, std::move(window_capturer)));
@@ skipping 106 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions