Aura: Desktop aura is now default on non-chromeos linux builds.

BUG=125106
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10389217

git-svn-id: http://src.chromium.org/svn/trunk/src/build@137982 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all.gyp

@@ -550,7 +550,6 @@
             '../chrome/chrome.gyp:chrome',
             '../chrome/chrome.gyp:interactive_ui_tests',            
             '../chrome/chrome.gyp:unit_tests',
-            '../remoting/remoting.gyp:remoting_unittests',
             '../ui/aura/aura.gyp:*',
             '../ui/compositor/compositor.gyp:*',
             '../ui/ui.gyp:gfx_unittests',

common.gypi

@@ -98,7 +98,7 @@
           # imply using ash. This rule should be removed for the future when
           # both Linux and Windows are using the aura windows without the ash
           # interface.
-          ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', {
+          ['use_aura==1 and OS=="win"', {
             'use_ash%': 1,
           }],
           ['use_ash==1', {