Update Chromium snapshot to stable version 33.0.1750.170

This is meant as a baseline commit hence it does not
include the patches we need to apply for QtWebEngine.
All patches should be rebased on top of this commit
so we can get rid of the external patches directory.
In future these baseline commits always have to include
the exact Chromium version returned by version_resolver.py's
currentVersion() in their first line, so that we can
retrieve the patches on top to apply on the upstream
repository. This also includes a ninja update.

Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 5 insertions, 32 deletions

diff --git a/chromium/build/common.gypi b/chromium/build/common.gypi
index e975a96cd52..d7b385cc0ee 100644
--- a/chromium/build/common.gypi
+++ b/chromium/build/common.gypi
@@ -343,7 +343,7 @@
       # Run tools/clang/scripts/update.sh to make sure they are compiled.
       # This causes 'clang_chrome_plugins_flags' to be set.
       # Has no effect if 'clang' is not set as well.
-      'clang_use_chrome_plugins%': 0,
+      'clang_use_chrome_plugins%': 1,
 
       # Enable building with ASAN (Clang's -fsanitize=address option).
       # -fsanitize=address only works with clang, but asan=1 implies clang=1
@@ -1232,9 +1232,6 @@
     # rlz codes for searches but do not use the library.
     'enable_rlz%': 0,
 
-    # Compile with libc++ instead of libstdc++.
-    'use_libcpp%' : 0,
-
     # Turns on the i18n support in V8.
     'v8_enable_i18n_support': 1,
 
@@ -1515,10 +1512,10 @@
           # someplace that Xcode doesn't know about, set mac_sdk_path to the
           # path to the SDK; when set to a non-empty string, SDK detection
           # based on mac_sdk_min will be bypassed entirely.
-          'mac_sdk_min%': '10.7',
+          'mac_sdk_min%': '10.6',
           'mac_sdk_path%': '',
 
-          'mac_deployment_target%': '10.7',
+          'mac_deployment_target%': '10.6',
         },
 
         'mac_sdk_min': '<(mac_sdk_min)',
@@ -1528,7 +1525,6 @@
         # Compile in Breakpad support by default so that it can be
         # tested, even if it is not enabled by default at runtime.
         'mac_breakpad_compiled_in%': 1,
-
         'conditions': [
           # mac_product_name is set to the name of the .app bundle as it should
           # appear on disk.  This duplicates data from
@@ -2138,17 +2134,6 @@
       ['use_clipboard_aurax11==1', {
         'defines': ['USE_CLIPBOARD_AURAX11=1'],
       }],
-      ['use_libcpp==1', {
-        'defines': ['USE_UNORDERED_CONTAINERS=1'],
-        'cflags_cc': [
-          '-Wno-deprecated-declarations',
-          '-Wno-newline-eof',
-          '-Wno-unused-value',
-          '-Wno-unused-variable',
-          '-Wno-unused-function',
-          '-stdlib=libc++'
-        ],
-      }],
       ['enable_one_click_signin==1', {
         'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
       }],
@@ -3350,7 +3335,7 @@
               # Clang considers the `register` keyword as deprecated, but e.g.
               # code generated by flex (used in angle) contains that keyword.
               # http://crbug.com/255186
-              '-Wno-deprecated',
+              '-Wno-deprecated-register',
             ],
             'cflags!': [
               # Clang doesn't seem to know know this flag.
@@ -4058,19 +4043,7 @@
                 # Clang considers the `register` keyword as deprecated, but e.g.
                 # code generated by flex (used in angle) contains that keyword.
                 # http://crbug.com/255186
-                '-Wno-deprecated',
-              ],
-            }],
-            ['use_libcpp==1', {
-              'OTHER_CPLUSPLUSFLAGS': ['-stdlib=libc++'],
-              'USE_LIBCPP': 'YES',
-              'WARNING_CFLAGS': [
-                '-Wno-deprecated-declarations',
-                '-Wno-newline-eof',
-                '-Wno-unused-value',
-                '-Wno-unused-variable',
-                '-Wno-unused-function',
-                '-Wno-header-hygiene',
+                '-Wno-deprecated-register',
               ],
             }],
             ['clang==1 and clang_use_chrome_plugins==1', {