Change WebRTC IP handling policy from multiple booleans to an enum.

content/content_common.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../net/net.gyp:net',
@@ skipping 136 matching lines @@
       'public/common/url_constants.cc',
       'public/common/url_constants.h',
       'public/common/url_fetcher.h',
       'public/common/url_utils.cc',
       'public/common/url_utils.h',
       'public/common/user_agent.h',
       'public/common/web_preferences.cc',
       'public/common/web_preferences.h',
       'public/common/webplugininfo.cc',
       'public/common/webplugininfo.h',
+      'public/common/webrtc_ip_handling_policy.cc',
+      'public/common/webrtc_ip_handling_policy.h',
       'public/common/window_container_type.cc',
       'public/common/window_container_type.h',
       'public/common/zygote_fork_delegate_linux.h',
     ],
     'private_common_sources': [
       'common/accessibility_messages.h',
       'common/all_messages.h',
       'common/android/address_parser.cc',
       'common/android/address_parser.h',
       'common/android/address_parser_internal.cc',
@@ skipping 647 matching lines @@
       ],
       'sources': [
         'common/gpu/media/android_video_encode_accelerator.cc',
         'common/gpu/media/android_video_encode_accelerator.h',
       ],
     }],
     ['enable_webrtc==1', {
       'dependencies': [
         '../third_party/libjingle/libjingle.gyp:libjingle',
       ],
+    }, {
+      'sources!': [

[nasko, 2015/11/04 17:34:12]

What is the goal of this change?

[guoweis_webrtc, 2015/11/04 17:38:07]

If there is no webrtc, there is no need to include these 2 files. Probably don't
do much but just for cleanness.

I tried to do public_common_sources! but it doesn't seem to work.

[nasko, 2015/11/04 17:50:58]

But you have already included it up in the public_common_sources and here. There
is no need for both of these to exist.

Shouldn't your sources string here drop the "!"?

+        'public/common/webrtc_ip_handling_policy.cc',
+        'public/common/webrtc_ip_handling_policy.h',
+      ],
     }],
     ['use_v4lplugin==1 and chromeos==1', {
       'defines': [
         'USE_LIBV4L2'
       ],
       'variables': {
         'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
         'extra_header': 'common/gpu/media/v4l2_stub_header.fragment',
         'sig_files': ['common/gpu/media/v4l2.sig'],
         'outfile_type': 'posix_stubs',
@@ skipping 270 matching lines @@
         'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
       ],
     }],
   ],
 }