Use same DesktopCaptureOptions in DesktopCaptureBase and DesktopCaptureDevice

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/webrtc/desktop_media_list_ash.h"
 #include "chrome/browser/media/webrtc/desktop_streams_registry.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"
 #include "chrome/browser/media/webrtc/tab_desktop_media_list.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/grit/chromium_strings.h"
+#include "content/public/browser/desktop_capture.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/manifest.h"
 #include "extensions/common/switches.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
@@ skipping 110 matching lines @@
     picker_ = g_picker_factory->CreatePicker();
   } else {
     // Create a screens list.
     if (show_screens) {
 #if defined(USE_ASH)
       screen_list =
           base::MakeUnique<DesktopMediaListAsh>(DesktopMediaListAsh::SCREENS);
 #endif
       if (!screen_list) {
         webrtc::DesktopCaptureOptions options =
-            webrtc::DesktopCaptureOptions::CreateDefault();
-        options.set_disable_effects(false);
+            content::CreateDesktopCaptureOptions();
         std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
             webrtc::DesktopCapturer::CreateScreenCapturer(options));
 
         screen_list = base::MakeUnique<NativeDesktopMediaList>(
             std::move(screen_capturer), nullptr);
       }
     }
 
     // Create a windows list.
     if (show_windows) {
 #if defined(USE_ASH)
       window_list =
           base::MakeUnique<DesktopMediaListAsh>(DesktopMediaListAsh::WINDOWS);
 #endif
       if (!window_list) {
         webrtc::DesktopCaptureOptions options =
-            webrtc::DesktopCaptureOptions::CreateDefault();
-        options.set_disable_effects(false);
+            content::CreateDesktopCaptureOptions();
         std::unique_ptr<webrtc::DesktopCapturer> window_capturer(
             webrtc::DesktopCapturer::CreateWindowCapturer(options));
 
         window_list = base::MakeUnique<NativeDesktopMediaList>(
             nullptr, std::move(window_capturer));
       }
     }
 
     if (show_tabs)
       tab_list = base::MakeUnique<TabDesktopMediaList>();
@@ skipping 115 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