More Aura fixes, renaming and stubbing

build/common.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 228 matching lines @@
           'toolkit_uses_gtk%': 1,
           'use_x11%': 1,
         }],
         ['use_aura==1 and OS!="win"', {
           'toolkit_uses_gtk%': 0,
         }],
 
         # A flag to enable or disable our compile-time dependency
         # on gnome-keyring. If that dependency is disabled, no gnome-keyring
         # support will be available. This option is useful
-        # for Linux distributions.
-        ['chromeos==1', {
+        # for Linux distributions and for Aura.
+        ['chromeos==1 or use_aura==1', {
           'use_gnome_keyring%': 0,
         }, {
           'use_gnome_keyring%': 1,
         }],
 
         ['toolkit_views==0 or OS=="mac"', {
           # GTK+ and Mac wants Title Case strings
           'use_titlecase_in_grd_files%': 1,
         }],
 
@@ skipping 2159 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }