Fix enable_webrtc

content/public/browser/render_process_host.h

Index: content/public/browser/render_process_host.h
diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h
index ee650367fccb1cd2dcfc0f4a26ecc0e8ab6dd14f..1e0e5ba02708e822f556fbe978019c29a8820117 100644
--- a/content/public/browser/render_process_host.h
+++ b/content/public/browser/render_process_host.h
@@ -198,6 +198,11 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Sender,
   // |empty_allowed| must be set to false for navigations for security reasons.
   virtual void FilterURL(bool empty_allowed, GURL* url) = 0;
 
+  typedef base::Callback<void(scoped_ptr<uint8[]> packet_header,

[jam, 2014/07/15 02:05:43]

why move this out instead of ifdef'ing out the code which uses it?

[zhaoze.zhou, 2014/07/15 13:21:21]

In file included from
../../content/browser/renderer_host/render_process_host_impl.cc:89:0:
../../content/browser/renderer_host/p2p/socket_dispatcher_host.h:53:13: error:
‘WebRtcRtpPacketCallback’ in ‘class content::RenderProcessHost’ does not name a
type
       const RenderProcessHost::WebRtcRtpPacketCallback& packet_callback);
             ^
../../content/browser/renderer_host/p2p/socket_dispatcher_host.h:53:57: error:
ISO C++ forbids declaration of ‘packet_callback’ with no type [-fpermissive]
       const RenderProcessHost::WebRtcRtpPacketCallback& packet_callback);
                                                         ^
../../content/browser/renderer_host/p2p/socket_dispatcher_host.h:112:3: error:
‘WebRtcRtpPacketCallback’ in ‘class content::RenderProcessHost’ does not name a
type
   RenderProcessHost::WebRtcRtpPacketCallback packet_callback_;
   ^

This error is in the condition of enable_webrtc = 0

[jam, 2014/07/15 16:20:39]

seems like "#if defined(ENABLE_WEBRTC)" should be added to
socket_dispatcher_host.h

+                              size_t header_length,
+                              size_t packet_length,
+                              bool incoming)> WebRtcRtpPacketCallback;
+
 #if defined(ENABLE_WEBRTC)
   virtual void EnableAecDump(const base::FilePath& file) = 0;
   virtual void DisableAecDump() = 0;
@@ -208,11 +213,6 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::Sender,
   virtual void SetWebRtcLogMessageCallback(
       base::Callback<void(const std::string&)> callback) = 0;
 
-  typedef base::Callback<void(scoped_ptr<uint8[]> packet_header,
-                              size_t header_length,
-                              size_t packet_length,
-                              bool incoming)> WebRtcRtpPacketCallback;
-
   typedef base::Callback<void(bool incoming, bool outgoing)>
       WebRtcStopRtpDumpCallback;