Fix enable_webrtc

content/public/browser/render_process_host.h

 // Copyright (c) 2012 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 CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_H_
 #define CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_H_
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/process/kill.h"
@@ skipping 180 matching lines @@
 
   // Called to resume the requests for a view created through window.open that
   // were initially blocked.
   virtual void ResumeRequestsForView(int route_id) = 0;
 
   // Checks that the given renderer can request |url|, if not it sets it to
   // about:blank.
   // |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;
 
   // When set, |callback| receives log messages regarding, for example, media
   // devices (webcams, mics, etc) that were initially requested in the render
   // process associated with this RenderProcessHost.
   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;
 
   // Starts passing RTP packets to |packet_callback| and returns the callback
   // used to stop dumping.
   virtual WebRtcStopRtpDumpCallback StartRtpDump(
       bool incoming,
       bool outgoing,
       const WebRtcRtpPacketCallback& packet_callback) = 0;
 #endif
@@ skipping 57 matching lines @@
   static void SetMaxRendererProcessCount(size_t count);
 
   // Returns the current max number of renderer processes used by the content
   // module.
   static size_t GetMaxRendererProcessCount();
 };
 
 }  // namespace content.
 
 #endif  // CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_H_