Revert of Add a test that uses C++11 features as a compiler canary.

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
     'SK_SUPPORT_GPU=<(skia_gpu)',
     'SK_SUPPORT_OPENCL=<(skia_opencl)',
     'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
     'SK_PICTURE_USE_SK_RECORD',
   ],
@@ skipping 184 matching lines @@
 
           '-Wall',
           '-Wextra',
           '-Winit-self',
           '-Wpointer-arith',
 
           '-Wno-c++11-extensions',
           '-Wno-unused-parameter',
         ],
         'cflags_cc': [
-          '-std=c++11',
           '-fno-rtti',
           '-Wnon-virtual-dtor',
           '-Wno-invalid-offsetof',  # GCC <4.6 is old-school strict about what is POD.
         ],
         'conditions': [
           [ 'skia_os != "chromeos"', {
             'conditions': [
               [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
                 'cflags': [
                   '-m64',
@@ skipping 231 matching lines @@
               [ 'skia_sanitizer == "thread"', {
                 'defines': [ 'SK_DYNAMIC_ANNOTATIONS_ENABLED=1' ],
               }],
               [ 'skia_sanitizer == "undefined"', {
                 'cflags_cc!': ['-fno-rtti'],
               }],
             ],
           }],
           [ 'skia_clang_build', {
             'cflags_cc': [
+                # Build in C++11 mode to make sure we'll have an easy time switching.
+                '-std=c++11',
                 '-Wno-unknown-warning-option',  # Allows unknown warnings.
                 '-Wno-deprecated',              # From Qt, via debugger (older Clang).
                 '-Wno-deprecated-register',     # From Qt, via debugger (newer Clang).
             ],
             'cflags': [
                 # Extra warnings we like but that only Clang knows about.
                 '-Wstring-conversion',
             ],
             'cflags!': [
                 '-mfpmath=sse',  # Clang doesn't need to be told this, and sometimes gets confused.
@@ skipping 29 matching lines @@
           'conditions': [
             [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES' }],
             [ 'skia_arch_width == 32', { 'ARCHS': ['i386']   }],
             [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }],
             [ 'skia_osx_deployment_target==""', {
               'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in env to ld.
             }, {
               'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
             }],
           ],
-          'CLANG_CXX_LANGUAGE_STANDARD':               'c++0x', # -std=c++11
-          'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES',   # -mssse3
-          'GCC_SYMBOLS_PRIVATE_EXTERN':                'NO',    # -fvisibility=hidden
-          'GCC_INLINES_ARE_PRIVATE_EXTERN':            'NO',    # -fvisibility-inlines-hidden
+          'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES',  # -mssse3
+          'GCC_SYMBOLS_PRIVATE_EXTERN':                'NO',   # -fvisibility=hidden
+          'GCC_INLINES_ARE_PRIVATE_EXTERN':            'NO',   # -fvisibility-inlines-hidden
           'WARNING_CFLAGS': [
             '-Wall',
             '-Wextra',
             '-Wno-unused-parameter',
             '-Wno-uninitialized',  # Disabled because we think GCC 4.2 is bad at this.
           ],
         },
       },
     ],
 
@@ skipping 19 matching lines @@
           },
           'Release': {
             'xcode_settings': {
               'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)',
             },
             'defines': [ 'NDEBUG' ],
           },
         },
         'xcode_settings': {
           'ARCHS': ['armv7'],
-          'CLANG_CXX_LANGUAGE_STANDARD':               'c++0x', # -std=c++11
           'CODE_SIGNING_REQUIRED': 'NO',
           'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
           'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
           'SDKROOT': 'iphoneos',
           'TARGETED_DEVICE_FAMILY': '1,2',
           'OTHER_CPLUSPLUSFLAGS': [
             '-fvisibility=hidden',
             '-fvisibility-inlines-hidden',
           ],
           'GCC_THUMB_SUPPORT': 'NO',
@@ skipping 71 matching lines @@
     [ 'skia_is_bot', {
       'defines': [ 'SK_CRASH_HANDLER' ],
     }],
 
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }