WebRTC Audio private API: removing WebRtcAudioPrivate(Set/Get)ActiveSinkFunction

chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc

 // Copyright 2013 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/webrtc_audio_private/webrtc_audio_private_api.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/media_device_id.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "media/audio/audio_device_description.h"
-#include "media/audio/audio_output_controller.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace extensions {
 
 using content::BrowserThread;
 using content::RenderProcessHost;
 using media::AudioDeviceDescriptions;
 using media::AudioManager;
 
@@ skipping 95 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&WebrtcAudioPrivateFunction::OnOutputDeviceDescriptions, this,
                  base::Passed(&device_descriptions)));
 }
 
 void WebrtcAudioPrivateFunction::OnOutputDeviceDescriptions(
     std::unique_ptr<AudioDeviceDescriptions> device_descriptions) {
   NOTREACHED();
 }
 
-bool WebrtcAudioPrivateFunction::GetControllerList(const RequestInfo& request) {
-  content::RenderProcessHost* rph = nullptr;
-
-  // If |guest_process_id| is defined, directly use this id to find the
-  // corresponding RenderProcessHost.
-  if (request.guest_process_id.get()) {
-    rph = content::RenderProcessHost::FromID(*request.guest_process_id);
-  } else if (request.tab_id.get()) {
-    int tab_id = *request.tab_id;
-    content::WebContents* contents = NULL;
-    if (!ExtensionTabUtil::GetTabById(tab_id, GetProfile(), true, NULL, NULL,
-                                      &contents, NULL)) {
-      error_ = extensions::ErrorUtils::FormatErrorMessage(
-          extensions::tabs_constants::kTabNotFoundError,
-          base::IntToString(tab_id));
-      return false;
-    }
-    rph = contents->GetRenderProcessHost();
-  } else {
-    return false;
-  }
-
-  if (!rph)
-    return false;
-
-  rph->GetAudioOutputControllers(
-      base::Bind(&WebrtcAudioPrivateFunction::OnControllerList, this));
-  return true;
-}
-
-void WebrtcAudioPrivateFunction::OnControllerList(
-    const content::RenderProcessHost::AudioOutputControllerList& list) {
-  NOTREACHED();
-}
-
 void WebrtcAudioPrivateFunction::CalculateHMAC(const std::string& raw_id) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&WebrtcAudioPrivateFunction::CalculateHMAC, this, raw_id));
     return;
   }
 
   std::string hmac = CalculateHMACImpl(raw_id);
@@ skipping 67 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&WebrtcAudioPrivateGetSinksFunction::DoneOnUIThread, this));
 }
 
 void WebrtcAudioPrivateGetSinksFunction::DoneOnUIThread() {
   SendResponse(true);
 }
 
-bool WebrtcAudioPrivateGetActiveSinkFunction::RunAsync() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  InitDeviceIDSalt();
-
-  std::unique_ptr<wap::GetActiveSink::Params> params(
-      wap::GetActiveSink::Params::Create(*args_));
-  EXTENSION_FUNCTION_VALIDATE(params.get());
-
-  return GetControllerList(params->request);
-}
-
-void WebrtcAudioPrivateGetActiveSinkFunction::OnControllerList(
-    const RenderProcessHost::AudioOutputControllerList& controllers) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  if (controllers.empty()) {
-    // If there is no current audio stream for the rvh, we return an
-    // empty string as the sink ID.
-    DVLOG(2) << "chrome.webrtcAudioPrivate.getActiveSink: No controllers.";
-    results_.reset(
-        wap::GetActiveSink::Results::Create(std::string()).release());
-    SendResponse(true);
-  } else {
-    DVLOG(2) << "chrome.webrtcAudioPrivate.getActiveSink: "
-             << controllers.size() << " controllers.";
-    // TODO(joi): Debug-only, DCHECK that all items have the same ID.
-
-    // Send the raw ID through CalculateHMAC, and send the result in
-    // OnHMACCalculated.
-    (*controllers.begin())->GetOutputDeviceId(
-        base::Bind(&WebrtcAudioPrivateGetActiveSinkFunction::CalculateHMAC,
-                   this));
-  }
-}
-
-void WebrtcAudioPrivateGetActiveSinkFunction::OnHMACCalculated(
-    const std::string& hmac_id) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  std::string result = hmac_id;
-  if (result.empty()) {
-    DVLOG(2) << "Received empty ID, replacing with default ID.";
-    result = media::AudioDeviceDescription::kDefaultDeviceId;
-  }
-  results_ = wap::GetActiveSink::Results::Create(result);
-  SendResponse(true);
-}
-
-WebrtcAudioPrivateSetActiveSinkFunction::
-    WebrtcAudioPrivateSetActiveSinkFunction()
-    : num_remaining_sink_ids_(0) {
-}
-
-WebrtcAudioPrivateSetActiveSinkFunction::
-~WebrtcAudioPrivateSetActiveSinkFunction() {
-}
-
-bool WebrtcAudioPrivateSetActiveSinkFunction::RunAsync() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  std::unique_ptr<wap::SetActiveSink::Params> params(
-      wap::SetActiveSink::Params::Create(*args_));
-  EXTENSION_FUNCTION_VALIDATE(params.get());
-
-  InitDeviceIDSalt();
-
-  if (params->request.guest_process_id.get()) {
-    request_info_.guest_process_id.reset(
-        new int(*params->request.guest_process_id));
-  } else if (params->request.tab_id.get()) {
-    request_info_.tab_id.reset(new int(*params->request.tab_id));
-  } else {
-    return false;
-  }
-
-  sink_id_ = params->sink_id;
-
-  return GetControllerList(request_info_);
-}
-
-void WebrtcAudioPrivateSetActiveSinkFunction::OnControllerList(
-    const RenderProcessHost::AudioOutputControllerList& controllers) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  std::string requested_process_type;
-  int requested_process_id;
-  if (request_info_.guest_process_id.get()) {
-    requested_process_type = "guestProcessId";
-    requested_process_id = *request_info_.guest_process_id;
-  } else {
-    requested_process_type = "tabId";
-    requested_process_id = *request_info_.tab_id;
-  }
-
-  controllers_ = controllers;
-  num_remaining_sink_ids_ = controllers_.size();
-  if (num_remaining_sink_ids_ == 0) {
-    error_ = extensions::ErrorUtils::FormatErrorMessage(
-        "No active stream for " + requested_process_type + " *",
-        base::IntToString(requested_process_id));
-    SendResponse(false);
-  } else {
-    // We need to get the output device IDs, and calculate the HMAC
-    // for each, to find the raw ID for the ID provided to this API
-    // function call.
-    GetOutputDeviceDescriptions();
-  }
-}
-
-void WebrtcAudioPrivateSetActiveSinkFunction::OnOutputDeviceDescriptions(
-    std::unique_ptr<AudioDeviceDescriptions> device_descriptions) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  std::string raw_sink_id;
-  if (sink_id_ == media::AudioDeviceDescription::kDefaultDeviceId) {
-    DVLOG(2) << "Received default ID, replacing with empty ID.";
-    raw_sink_id = "";
-  } else {
-    for (AudioDeviceDescriptions::const_iterator it =
-             device_descriptions->begin();
-         it != device_descriptions->end(); ++it) {
-      if (sink_id_ == CalculateHMACImpl(it->unique_id)) {
-        raw_sink_id = it->unique_id;
-        break;
-      }
-    }
-
-    if (raw_sink_id.empty())
-      DVLOG(2) << "Found no matching raw sink ID for HMAC " << sink_id_;
-  }
-
-  RenderProcessHost::AudioOutputControllerList::const_iterator it =
-      controllers_.begin();
-  for (; it != controllers_.end(); ++it) {
-    (*it)->SwitchOutputDevice(raw_sink_id, base::Bind(
-        &WebrtcAudioPrivateSetActiveSinkFunction::SwitchDone, this));
-  }
-}
-
-void WebrtcAudioPrivateSetActiveSinkFunction::SwitchDone() {
-  if (--num_remaining_sink_ids_ == 0) {
-    BrowserThread::PostTask(
-        BrowserThread::UI,
-        FROM_HERE,
-        base::Bind(&WebrtcAudioPrivateSetActiveSinkFunction::DoneOnUIThread,
-                   this));
-  }
-}
-
-void WebrtcAudioPrivateSetActiveSinkFunction::DoneOnUIThread() {
-  SendResponse(true);
-}
-
 WebrtcAudioPrivateGetAssociatedSinkFunction::
 WebrtcAudioPrivateGetAssociatedSinkFunction() {
 }
 
 WebrtcAudioPrivateGetAssociatedSinkFunction::
 ~WebrtcAudioPrivateGetAssociatedSinkFunction() {
 }
 
 bool WebrtcAudioPrivateGetAssociatedSinkFunction::RunAsync() {
   params_ = wap::GetAssociatedSink::Params::Create(*args_);
@@ skipping 24 matching lines @@
 
 void
 WebrtcAudioPrivateGetAssociatedSinkFunction::GetRawSourceIDOnIOThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   url::Origin security_origin(GURL(params_->security_origin));
   std::string source_id_in_origin(params_->source_id_in_origin);
 
   // Find the raw source ID for source_id_in_origin.
   std::string raw_source_id;
   for (AudioDeviceDescriptions::const_iterator it = source_devices_.begin();

[Max Morin, 2017/03/31 07:04:20]

Could you rewrite this to a "for each" loop, since you are modifying this file
anyways? :) Actually, this seems to duplicate some code from one of the
managers, maybe there should just be a reverse hash lookup utility function
somewhere around there? No need to do it now though.

[o1ka, 2017/03/31 09:15:28]

All this code will be changed to switch to AudioSysem - I'm intentionally not
touching it now.

        it != source_devices_.end(); ++it) {
     const std::string& id = it->unique_id;
     if (content::DoesMediaDeviceIDMatchHMAC(device_id_salt(), security_origin,
                                             source_id_in_origin, id)) {
       raw_source_id = id;
       DVLOG(2) << "Found raw ID " << raw_source_id
                << " for source ID in origin " << source_id_in_origin;
       break;
     }
   }
@@ skipping 29 matching lines @@
     DVLOG(2) << "Got default ID, replacing with empty ID.";
     results_ = wap::GetAssociatedSink::Results::Create("");
   } else {
     results_ = wap::GetAssociatedSink::Results::Create(associated_sink_id);
   }
 
   SendResponse(true);
 }
 
 }  // namespace extensions