Roll chromium_revision 289723:291647

To pick up recent fixes after the Chromium Git switch.

Relevant changes pulled in by this roll:
* r291168 refactor sanitizer_options (we can now remove some hacks)
* r291647 roll of nss.gyp (its paths work with how we build for iOS).

BUG=2863,3731
R=iannucci@chromium.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/22489004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6967 4adac7df-926f-26a2-2b94-8c16560cd09d

DEPS

@@ -14,7 +14,7 @@ vars = {
   # Use this googlecode_url variable only if there is an internal mirror for it.
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
-  "chromium_revision": "3da41f9378f9d075a94cc278f99ce4344f9acc7b",
+  "chromium_revision": "b1748b82e821777fb8cd843fd54ff3aeb220a215",
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than

chromium/.gclient

@@ -1,11 +1,10 @@
-solutions = [
+solutions = [{
-  { "name"        : "src",
+  'name': 'src',
-    "url"         : "https://chromium.googlesource.com/chromium/src.git",
+  'url': 'https://chromium.googlesource.com/chromium/src.git',
-    "deps_file"   : ".DEPS.git",
+  'deps_file': '.DEPS.git',
-    "managed"     : True,
+  'managed': True,
-    "custom_deps" : {
+  'custom_deps': {},
-    },
+  'safesync_url': ''
-    "safesync_url": "",
+}]
-  },
+
-]
 cache_dir = None

setup_links.py

@@ -78,11 +78,6 @@ FILES = {
   '.gn': None,
   'tools/find_depot_tools.py': None,
   'third_party/BUILD.gn': None,
-
-  # This can be removed after https://codereview.chromium.org/357623003/ is
-  # landed and WebRTC is refactored+rolled past that Chromium revision.
-  'base/debug/sanitizer_options.cc': (
-      'tools/sanitizer_options/sanitizer_options.cc'),
 }
 
 CHROMIUM_CHECKOUT = os.path.join('chromium', 'src')

webrtc/build/sanitizer_options.gyp

@@ -1,59 +0,0 @@
-# Copyright (c) 2014 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 is a similar target to the one in Chromium's base.gyp. It's needed to get
-# the same sanitizer settings as Chromium uses (i.e. ASan, LSan, TSan...).
-{
-  'targets': [
-    {
-      'target_name': 'sanitizer_options',
-      'type': 'static_library',
-      'toolsets': ['host', 'target'],
-      'variables': {
-         # Every target is going to depend on sanitizer_options, so allow
-         # this one to depend on itself.
-         'prune_self_dependency': 1,
-         # Do not let 'none' targets depend on this one, they don't need to.
-         'link_dependency': 1,
-       },
-      'sources': [
-        '<(DEPTH)/tools/sanitizer_options/sanitizer_options.cc',
-      ],
-      'include_dirs': [
-        '<(DEPTH)',
-      ],
-      # Some targets may want to opt-out from ASan, TSan and MSan and link
-      # without the corresponding runtime libraries. We drop the libc++
-      # dependency and omit the compiler flags to avoid bringing instrumented
-      # code to those targets.
-      'conditions': [
-        ['use_custom_libcxx==1', {
-          'dependencies!': [
-            '<(DEPTH)/third_party/libc++/libc++.gyp:libcxx_proxy',
-          ],
-        }],
-        ['tsan==1', {
-          'sources': [
-            'tsan_suppressions.cc',
-          ],
-        }],
-      ],
-      'cflags!': [
-        '-fsanitize=address',
-        '-fsanitize=thread',
-        '-fsanitize=memory',
-        '-fsanitize-memory-track-origins',
-      ],
-      'direct_dependent_settings': {
-        'ldflags': [
-          '-Wl,-u_sanitizer_options_link_helper',
-        ],
-      },
-    },
-  ],  # targets
-}

webrtc/supplement.gypi

@@ -5,17 +5,20 @@
     },
     'webrtc_root%': '<(webrtc_root)',
     'build_with_chromium': 0,
-    'use_sanitizer_options': 0,
   },
   'target_defaults': {
-    'conditions': [
+    'target_conditions': [
-      # Add default sanitizer options similar to Chromium. This cannot be
+      ['_target_name=="sanitizer_options"', {
-      # put in webrtc/build/common.gypi since that file is not included by
+        'conditions': [
-      # third party code (yasm will throw leak errors during compile when
+          ['tsan==1', {
-      # GYP_DEFINES="asan=1".
+            # Replace Chromium's TSan v2 suppressions with our own for WebRTC.
-      ['OS=="linux" and (chromeos==0 or target_arch!="ia32")', {
+            'sources/': [
-        'dependencies': [
+              ['exclude', 'tsan_suppressions.cc'],
-          '<(webrtc_root)/build/sanitizer_options.gyp:sanitizer_options',
+            ],
+            'sources': [
+              '<(webrtc_root)/build/tsan_suppressions_webrtc.cc',
+            ],
+          }],
         ],
       }],
     ],