Fix webrtcAudioPrivate API to handle requests from <webview>s.

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

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEBRTC_AUDIO_PRIVATE_WEBRTC_AUDIO_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEBRTC_AUDIO_PRIVATE_WEBRTC_AUDIO_PRIVATE_API_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/system_monitor/system_monitor.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/common/extensions/api/webrtc_audio_private.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_process_host.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "media/audio/audio_device_name.h"
 #include "url/gurl.h"
 
 namespace content {
 class ResourceContext;
 }
 
 namespace extensions {
 
@@ skipping 38 matching lines @@
   virtual void OnOutputDeviceNames(
       scoped_ptr<media::AudioDeviceNames> device_names);
 
   // Retrieve the list of AudioOutputController objects. Calls back
   // via OnControllerList.
   //
   // Returns false on error, in which case it has set |error_| and the
   // entire function should fail.
   //
   // Call from any thread. Callback will occur on originating thread.
-  bool GetControllerList(int tab_id);
+  bool GetControllerList(const api::webrtc_audio_private::RequestInfo& request);
 
   // Must override this if you call GetControllerList.
   virtual void OnControllerList(
-      const content::RenderViewHost::AudioOutputControllerList& list);
+      const content::RenderProcessHost::AudioOutputControllerList& list);
 
   // Calculates a single HMAC. Call from any thread. Calls back via
   // OnHMACCalculated on UI thread.
   //
   // This function, and device ID HMACs in this API in general use the
   // calling extension's ID as the security origin. The only exception
   // to this rule is when calculating the input device ID HMAC in
   // getAssociatedSink, where we use the provided |securityOrigin|.
   void CalculateHMAC(const std::string& raw_id);
 
@@ skipping 41 matching lines @@
     : public WebrtcAudioPrivateFunction {
  protected:
   ~WebrtcAudioPrivateGetActiveSinkFunction() override {}
 
  private:
   DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.getActiveSink",
                              WEBRTC_AUDIO_PRIVATE_GET_ACTIVE_SINK);
 
   bool RunAsync() override;
   void OnControllerList(
-      const content::RenderViewHost::AudioOutputControllerList& controllers)
+      const content::RenderProcessHost::AudioOutputControllerList& controllers)
       override;
   void OnHMACCalculated(const std::string& hmac) override;
 };
 
 class WebrtcAudioPrivateSetActiveSinkFunction
     : public WebrtcAudioPrivateFunction {
  public:
   WebrtcAudioPrivateSetActiveSinkFunction();
 
  protected:
   ~WebrtcAudioPrivateSetActiveSinkFunction() override;
 
  private:
   DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.setActiveSink",
                              WEBRTC_AUDIO_PRIVATE_SET_ACTIVE_SINK);
 
   bool RunAsync() override;
   void OnControllerList(
-      const content::RenderViewHost::AudioOutputControllerList& controllers)
+      const content::RenderProcessHost::AudioOutputControllerList& controllers)
       override;
   void OnOutputDeviceNames(
       scoped_ptr<media::AudioDeviceNames> device_names) override;
   void SwitchDone();
   void DoneOnUIThread();
 
-  int tab_id_;
+  api::webrtc_audio_private::RequestInfo request_info_;
   std::string sink_id_;
 
   // Filled in by OnControllerList.
-  content::RenderViewHost::AudioOutputControllerList controllers_;
+  content::RenderProcessHost::AudioOutputControllerList controllers_;
 
   // Number of sink IDs we are still waiting for. Can become greater
   // than 0 in OnControllerList, decreases on every OnSinkId call.
   size_t num_remaining_sink_ids_;
 };
 
 class WebrtcAudioPrivateGetAssociatedSinkFunction
     : public WebrtcAudioPrivateFunction {
  public:
   WebrtcAudioPrivateGetAssociatedSinkFunction();
@@ skipping 42 matching lines @@
   // time, no locking needed.
   scoped_ptr<api::webrtc_audio_private::GetAssociatedSink::Params> params_;
 
   // Audio sources (input devices). Filled in by DoWorkOnDeviceThread.
   media::AudioDeviceNames source_devices_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEBRTC_AUDIO_PRIVATE_WEBRTC_AUDIO_PRIVATE_API_H_