Part 1: Plumb render view ID to render host

content/renderer/renderer_webkitplatformsupport_impl.cc

Index: content/renderer/renderer_webkitplatformsupport_impl.cc
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 6ef60cc3f446da3477e212e0d16c178375e48950..fd4b48499649dce50c8de87cd853d56b63041664 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -26,7 +26,6 @@
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
 #include "content/renderer/gamepad_shared_memory_reader.h"
 #include "content/renderer/media/audio_hardware.h"
-#include "content/renderer/media/renderer_webaudiodevice_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_clipboard_client.h"
@@ -597,47 +596,11 @@ RendererWebKitPlatformSupportImpl::createAudioDevice(
     unsigned numberOfChannels,
     double sampleRate,
     WebAudioDevice::RenderCallback* callback) {
-  ChannelLayout layout = CHANNEL_LAYOUT_UNSUPPORTED;
-
-  // The |numberOfChannels| does not exactly identify the channel layout of the
-  // device. The switch statement below assigns a best guess to the channel
-  // layout based on number of channels.
-  // TODO(crogers): WebKit should give the channel layout instead of the hard
-  // channel count.
-  switch (numberOfChannels) {
-    case 1:
-      layout = CHANNEL_LAYOUT_MONO;
-      break;
-    case 2:
-      layout = CHANNEL_LAYOUT_STEREO;
-      break;
-    case 3:
-      layout = CHANNEL_LAYOUT_2_1;
-      break;
-    case 4:
-      layout = CHANNEL_LAYOUT_4_0;
-      break;
-    case 5:
-      layout = CHANNEL_LAYOUT_5_0;
-      break;
-    case 6:
-      layout = CHANNEL_LAYOUT_5_1;
-      break;
-    case 7:
-      layout = CHANNEL_LAYOUT_7_0;
-      break;
-    case 8:
-      layout = CHANNEL_LAYOUT_7_1;
-      break;
-    default:
-      layout = CHANNEL_LAYOUT_STEREO;
-  }
-
-  media::AudioParameters params(
-      media::AudioParameters::AUDIO_PCM_LOW_LATENCY, layout,
-      static_cast<int>(sampleRate), 16, bufferSize);
-
-  return new RendererWebAudioDeviceImpl(params, callback);
+  // Callers should use RenderViewImpl::createAudioDevice() instead.
+  // TODO(sail): Remove this function when WebKit::Platform::createAudioDevice()
+  // is removed.
+  CHECK(false);
+  return NULL;
 }
 
 //------------------------------------------------------------------------------