Revert r9861 to fix build

chrome/common/render_messages.h

 // Copyright (c) 2006-2008 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_COMMON_RENDER_MESSAGES_H_
 #define CHROME_COMMON_RENDER_MESSAGES_H_
 
 #include <string>
 #include <vector>
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "chrome/browser/renderer_host/resource_handler.h"
 #include "chrome/common/accessibility.h"
 #include "chrome/common/bitmap_wire_data.h"
 #include "chrome/common/filter_policy.h"
 #include "chrome/common/ipc_message_utils.h"
 #include "chrome/common/modal_dialog_event.h"
 #include "chrome/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
-#include "media/audio/audio_output.h"
 #include "net/base/upload_data.h"
 #include "net/url_request/url_request_status.h"
 #include "webkit/glue/autofill_form.h"
 #include "webkit/glue/cache_manager.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/screen_info.h"
@@ skipping 283 matching lines @@
   double actual_shrink;
 };
 
 // The first parameter for the ViewHostMsg_ImeUpdateStatus message.
 enum ViewHostMsg_ImeControl {
   IME_DISABLE = 0,
   IME_MOVE_WINDOWS,
   IME_COMPLETE_COMPOSITION,
 };
 
-// Parameters for creating an audio output stream.
-struct ViewHostMsg_Audio_CreateStream {
-  // Format request for the stream.
-  AudioManager::Format format;
-
-  // Number of channels.
-  int channels;
-
-  // Sampling rate (frequency) of the output stream.
-  int sample_rate;
-
-  // Number of bits per sample;
-  int bits_per_sample;
-
-  // Number of bytes per packet.
-  size_t packet_size;
-};
 
 namespace IPC {
 
 template <>
 struct ParamTraits<ResourceType::Type> {
   typedef ResourceType::Type param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteInt(p);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
@@ skipping 1243 matching lines @@
   static bool Read(const Message* m, void** iter, param_type* p) {
     return true;
   }
 #endif
 
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<ModalDialogEvent>");
   }
 };
 
-// Traits for AudioManager::Format.
-template <>
-struct ParamTraits<AudioManager::Format> {
-  typedef AudioManager::Format param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteInt(p);
-  }
-  static bool Read(const Message* m, void** iter, param_type* p) {
-    int type;
-    if (!m->ReadInt(iter, &type))
-      return false;
-    *p = static_cast<AudioManager::Format>(type);
-    return true;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    std::wstring format;
-    switch (p) {
-     case AudioManager::AUDIO_PCM_LINEAR:
-       format = L"AUDIO_PCM_LINEAR";
-       break;
-     case AudioManager::AUDIO_PCM_DELTA:
-       format = L"AUDIO_PCM_DELTA";
-       break;
-     case AudioManager::AUDIO_MOCK:
-       format = L"AUDIO_MOCK";
-       break;
-     default:
-       format = L"AUDIO_LAST_FORMAT";
-       break;
-    }
-    LogParam(format, l);
-  }
-};
-
-// Traits for ViewHostMsg_Audio_CreateStream.
-template <>
-struct ParamTraits<ViewHostMsg_Audio_CreateStream> {
-  typedef ViewHostMsg_Audio_CreateStream param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.format);
-    WriteParam(m, p.channels);
-    WriteParam(m, p.sample_rate);
-    WriteParam(m, p.bits_per_sample);
-    WriteParam(m, p.packet_size);
-  }
-  static bool Read(const Message* m, void** iter, param_type* p) {
-    return
-      ReadParam(m, iter, &p->format) &&
-      ReadParam(m, iter, &p->channels) &&
-      ReadParam(m, iter, &p->sample_rate) &&
-      ReadParam(m, iter, &p->bits_per_sample) &&
-      ReadParam(m, iter, &p->packet_size);
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    l->append(L"<ViewHostMsg_Audio_CreateStream>(");
-    LogParam(p.format, l);
-    l->append(L", ");
-    LogParam(p.channels, l);
-    l->append(L", ");
-    LogParam(p.sample_rate, l);
-    l->append(L", ");
-    LogParam(p.bits_per_sample, l);
-    l->append(L", ");
-    LogParam(p.packet_size, l);
-    l->append(L")");
-  }
-};
-
-
 #if defined(OS_POSIX)
 
 // TODO(port): this shouldn't exist. However, the plugin stuff is really using
 // HWNDS (NativeView), and making Windows calls based on them. I've not figured
 // out the deal with plugins yet.
 template <>
 struct ParamTraits<gfx::NativeView> {
   typedef gfx::NativeView param_type;
   static void Write(Message* m, const param_type& p) {
     NOTIMPLEMENTED();
@@ skipping 12 matching lines @@
 
 #endif  // defined(OS_POSIX)
 
 }  // namespace IPC
 
 
 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h"
 #include "chrome/common/ipc_message_macros.h"
 
 #endif  // CHROME_COMMON_RENDER_MESSAGES_H_