Update from https://crrev.com/329939

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index a4062488aeb1a10bd828b3844bb49e5d0722888d..634f478a10b83b45ab3bc733f1382da83bc6ab28 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -371,11 +371,11 @@
       'configuration_policy%': 1,
 
       # Variable safe_browsing is used to control the build time configuration
-      # for safe browsing feature. Safe browsing can be compiled in 3 different
+      # for safe browsing feature. Safe browsing can be compiled in 4 different
       # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and
-      # reporting features without enabling phishing and malware detection. This
-      # is useful to integrate a third party phishing/malware detection to
-      # existing safe browsing logic.
+      # reporting features for use with Data Saver on Mobile, and 3 enables
+      # extended mobile protection via an external API.  When 3 is fully
+      # deployed, it will replace 2.
       'safe_browsing%': 1,
 
       # Web speech is enabled by default. Set to 0 to disable.
@@ -417,6 +417,9 @@
       # See https://code.google.com/p/sawbuck/wiki/SyzyASanHowTo
       'syzyasan%': 0,
 
+      # Enable crash reporting via Kasko.
+      'kasko%': 0,
+
       # Enable building with LSan (Clang's -fsanitize=leak option).
       # -fsanitize=leak only works with clang, but lsan=1 implies clang=1
       # See https://sites.google.com/a/chromium.org/dev/developers/testing/leaksanitizer
@@ -920,8 +923,6 @@
         ['chromeos==1', {
           'enable_basic_printing%': 0,
           'enable_print_preview%': 1,
-          # When building for ChromeOS we dont want Chromium to use libjpeg_turbo.
-          'use_libjpeg_turbo%': 0,
         }],
 
         # Do not enable the Settings App on ChromeOS.
@@ -1009,15 +1010,6 @@
         }, {
           'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
         }],
-
-        # Enable crash reporting via Kasko.
-        ['OS=="win" and target_arch=="ia32"', {
-          # TODO(erikwright): This should be disabled after a single ship on Canary channel.
-          'kasko%': 1,
-        }, {
-          'kasko%': 0,
-        }],
-
       ],
 
       # Setting this to '0' will cause V8's startup snapshot to be
@@ -1520,6 +1512,11 @@
     # Experiment: http://crbug.com/426914
     'envoy%': 0,
 
+    # Used to set libjpeg_gyp_path. Chrome OS ui/gfx/gfx.gyp uses the IJG path
+    # for robust login screen decoding.
+    'libjpeg_ijg_gyp_path': '<(DEPTH)/third_party/libjpeg/libjpeg.gyp',
+    'libjpeg_turbo_gyp_path': '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp',
+
     'conditions': [
       ['buildtype=="Official"', {
         # Continue to embed build meta data in Official builds, basically the
@@ -1814,9 +1811,6 @@
         'p2p_apis%' : 0,
 
         'gtest_target_type%': 'shared_library',
-
-        # Uses system APIs for decoding audio and video.
-        'use_libffmpeg%': '0',
       }],  # OS=="android"
       ['embedded==1', {
         'use_system_fontconfig%': 0,
@@ -2008,9 +2002,9 @@
       # library used by Chromium.
       ['use_system_libjpeg==1 or use_libjpeg_turbo==0', {
         # Configuration for using the system libjeg is here.
-        'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
+        'libjpeg_gyp_path': '<(libjpeg_ijg_gyp_path)',
       }, {
-        'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
+        'libjpeg_gyp_path': '<(libjpeg_turbo_gyp_path)',
       }],
 
       # Options controlling the use of GConf (the classic GNOME configuration
@@ -2180,23 +2174,17 @@
                 ],
               },
               'clang_dynlib_flags%': '-Xclang -load -Xclang <(clang_lib_path) ',
-              'clang_plugin_args%': '',
             }, { # OS == "win"
               # On Windows, the plugin is built directly into clang, so there's
               # no need to load it dynamically.
               'clang_dynlib_flags%': '',
-
-              # Don't error on plugin warnings on Windows until pre-existing warnings
-              # are cleaned up.  https://crbug.com/467287
-              'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang warn-only',
             }]
           ],
         },
         # If you change these, also change build/config/clang/BUILD.gn.
         'clang_chrome_plugins_flags%':
           '<(clang_dynlib_flags)'
-          '-Xclang -add-plugin -Xclang find-bad-constructs '
-          '<(clang_plugin_args)',
+          '-Xclang -add-plugin -Xclang find-bad-constructs ',
       }],
       ['asan==1 or msan==1 or lsan==1 or tsan==1', {
         'clang%': 1,
@@ -2248,9 +2236,9 @@
         ],
       }],
 
-      ['OS=="win"', {
-        # The Blink GC plugin doesn't currently work on Windows.
-        # TODO(hans): One day, this will work. (crbug.com/82385)
+      ['OS=="win" and target_arch=="x64"', {
+        # TODO(thakis): Enable on x64 once all warnings are fixed.
+        # http://crbug.com/486571
         'blink_gc_plugin%': 0,
       }],
 
@@ -2631,13 +2619,13 @@
           ],
         },
       }],
-      ['(clang==1 or host_clang==1) and OS!="win"', {
+      ['clang==1 or host_clang==1', {
         # This is here so that all files get recompiled after a clang roll and
         # when turning clang on or off.
         # (defines are passed via the command line, and build systems rebuild
         # things when their commandline changes). Nothing should ever read this
         # define.
-        'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh --print-revision)'],
+        'defines': ['CR_CLANG_REVISION=<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)'],
       }],
       ['enable_rlz==1', {
         'defines': ['ENABLE_RLZ'],
@@ -2940,6 +2928,8 @@
         'defines': ['ENABLE_AUTOFILL_DIALOG=1'],
       }],
       ['enable_prod_wallet_service==1', {
+        # In GN, this is set on the autofill tagets only. See
+        # //components/autofill/core/browser:wallet_service
         'defines': ['ENABLE_PROD_WALLET_SERVICE=1'],
       }],
       ['enable_background==1', {
@@ -3018,8 +3008,8 @@
       # SAFE_BROWSING_DB_REMOTE - service talks via API to a database
       # SAFE_BROWSING_CSD - enable client-side phishing detection.
       ['safe_browsing==1', {
-        # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING
         'defines': [
+          # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING
           'FULL_SAFE_BROWSING',
           'SAFE_BROWSING_CSD',
           'SAFE_BROWSING_DB_LOCAL',
@@ -3033,6 +3023,14 @@
           'SAFE_BROWSING_SERVICE',
         ],
       }],
+      ['safe_browsing==3', {
+        'defines': [
+          # TODO(nparker): Remove existing uses of MOBILE_SAFE_BROWSING
+          'MOBILE_SAFE_BROWSING',
+          'SAFE_BROWSING_DB_REMOTE',
+          'SAFE_BROWSING_SERVICE',
+        ],
+      }],
     ],  # conditions for 'target_defaults'
     'target_conditions': [
       ['<(use_libpci)==1', {