Revert of Set defines for Chromium build.

webrtc/build/common.gypi

 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # This file contains common settings for building WebRTC components.
 
@@ skipping 245 matching lines @@
               # For WebRTC, we want it there as well, because ASSERT and
               # friends trigger off of it.
               '_DEBUG',
             ],
           },
         },
       }],
       ['build_with_chromium==1', {
         'defines': [
           # Changes settings for Chromium build.
-          # TODO(kjellander): Cleanup unused ones and move defines closer to the
-          # source when webrtc:4256 is completed.
-          'ENABLE_EXTERNAL_AUTH',
-          'EXPAT_RELATIVE_PATH',
-          'FEATURE_ENABLE_SSL',
-          'GTEST_RELATIVE_PATH',
-          'HAVE_OPENSSL_SSL_H',
-          'HAVE_SCTP',
-          'HAVE_SRTP',
-          'HAVE_WEBRTC_VIDEO',
-          'HAVE_WEBRTC_VOICE',
+          'WEBRTC_CHROMIUM_BUILD',
           'LOGGING_INSIDE_WEBRTC',
-          'NO_MAIN_THREAD_WRAPPING',
-          'NO_SOUND_SYSTEM',
-          'SRTP_RELATIVE_PATH',
-          'SSL_USE_OPENSSL',
-          'USE_WEBRTC_DEV_BRANCH',
-          'WEBRTC_CHROMIUM_BUILD',
-        ],
-        'conditions': [
-          ['OS=="win" and target_arch=="ia32"', {
-            'defines': [
-              '_USE_32BIT_TIME_T',
-            ],
-          }],
         ],
         'include_dirs': [
           # Include the top-level directory when building in Chrome, so we can
           # use full paths (e.g. headers inside testing/ or third_party/).
           '<(DEPTH)',
           # The overrides must be included before the WebRTC root as that's the
           # mechanism for selecting the override headers in Chromium.
           '../../webrtc_overrides',
           # The WebRTC root is needed to allow includes in the WebRTC code base
           # to be prefixed with webrtc/.
@@ skipping 154 matching lines @@
              # functions. Ensure they are disabled for all compilers.
              'cflags': [
                '-fno-builtin-cos',
                '-fno-builtin-sin',
                '-fno-builtin-cosf',
                '-fno-builtin-sinf',
              ],
            }],
          ],
       }],
-      ['chromeos==1', {
-        'defines': [
-          'CHROMEOS',
-        ],
-      }],
-      ['os_bsd==1', {
-        'defines': [
-          'BSD',
-        ],
-      }],
-      ['OS=="openbsd"', {
-        'defines': [
-          'OPENBSD',
-        ],
-      }],
       ['include_internal_audio_device==1', {
         'defines': [
           'WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE',
         ],
       }],
     ], # conditions
     'direct_dependent_settings': {
       'conditions': [
         ['build_with_mozilla==1', {
           'defines': [
             # Changes settings for Mozilla build.
             'WEBRTC_MOZILLA_BUILD',
            ],
         }],
         ['build_with_chromium==1', {
           'defines': [
             # Changes settings for Chromium build.
-            # TODO(kjellander): Cleanup unused ones and move defines closer to
-            # the source when webrtc:4256 is completed.
-            'FEATURE_ENABLE_SSL',
-            'FEATURE_ENABLE_VOICEMAIL',
-            'EXPAT_RELATIVE_PATH',
-            'GTEST_RELATIVE_PATH',
-            'NO_MAIN_THREAD_WRAPPING',
-            'NO_SOUND_SYSTEM',
             'WEBRTC_CHROMIUM_BUILD',
           ],
           'include_dirs': [
             # The overrides must be included first as that is the mechanism for
             # selecting the override headers in Chromium.
             '../../webrtc_overrides',
             '../..',
           ],
         }, {
           'include_dirs': [
             '../..',
           ],
         }],
         ['OS=="mac"', {
           'defines': [
             'WEBRTC_MAC',
           ],
         }],
         ['OS=="ios"', {
           'defines': [
             'WEBRTC_MAC',
             'WEBRTC_IOS',
           ],
         }],
         ['OS=="win"', {
           'defines': [
             'WEBRTC_WIN',
-            '_CRT_SECURE_NO_WARNINGS',  # Suppres warnings about _vsnprinf
           ],
         }],
         ['OS=="linux"', {
           'defines': [
             'WEBRTC_LINUX',
           ],
         }],
         ['OS=="android"', {
           'defines': [
             'WEBRTC_LINUX',
             'WEBRTC_ANDROID',
            ],
         }],
         ['os_posix==1', {
           # For access to standard POSIXish features, use WEBRTC_POSIX instead
           # of a more specific macro.
           'defines': [
             'WEBRTC_POSIX',
           ],
         }],
-        ['chromeos==1', {
-          'defines': [
-            'CHROMEOS',
-          ],
-        }],
-        ['os_bsd==1', {
-          'defines': [
-            'BSD',
-          ],
-        }],
-        ['OS=="openbsd"', {
-          'defines': [
-            'OPENBSD',
-          ],
-        }],
       ],
     },
   }, # target_defaults
 }