Fix the build when enable_webrtc is set to 0.

Review URL: https://codereview.chromium.org/381683003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284691 0039d316-1c4b-4281-b951-d872f2087c98

content/common/content_message_generator.h

@@ -45,7 +45,6 @@
 #include "content/common/message_port_messages.h"
 #include "content/common/mime_registry_messages.h"
 #include "content/common/mojo/mojo_messages.h"
-#include "content/common/p2p_messages.h"
 #include "content/common/pepper_messages.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/common/power_monitor_messages.h"
@@ -63,6 +62,10 @@
 #include "content/common/websocket_messages.h"
 #include "content/common/worker_messages.h"
 
+#if defined(ENABLE_WEBRTC)
+#include "content/common/p2p_messages.h"
+#endif
+
 #if defined(OS_ANDROID)
 #include "content/common/gin_java_bridge_messages.h"
 #include "content/common/media/media_player_messages_android.h"

content/content_common.gypi

@@ -11,7 +11,6 @@
     '../skia/skia.gyp:skia',
     '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
     '../third_party/icu/icu.gyp:icuuc',
-    '../third_party/libjingle/libjingle.gyp:libjingle',
     '../ui/accessibility/accessibility.gyp:accessibility',
     '../ui/base/ui_base.gyp:ui_base',
     '../ui/events/ipc/events_ipc.gyp:events_ipc',
@@ -719,6 +718,11 @@
         'common/gpu/media/android_video_encode_accelerator.h',
       ],
     }],
+    ['enable_webrtc==1', {
+      'dependencies': [
+        '../third_party/libjingle/libjingle.gyp:libjingle',
+      ],
+    }],
     ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
       'dependencies': [
         '../media/media.gyp:media',

content/shell/renderer/test_runner/web_frame_test_proxy.h

@@ -281,11 +281,13 @@ class WebFrameTestProxy : public Base {
   }
 
  private:
+#if defined(ENABLE_WEBRTC)
   virtual scoped_ptr<MediaStreamRendererFactory>
   CreateRendererFactory() OVERRIDE {
     return scoped_ptr<MediaStreamRendererFactory>(
         new TestMediaStreamRendererFactory());
   }
+#endif
 
   WebTestProxyBase* base_proxy_;