athena: Move the USE_ATHENA define into //chrome.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index be6e7797822f7fb52c246069e677a5113bcfdeb9..000ab7c65b8711cdf902121ed3f457dd9c0fae23 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -30,9 +30,6 @@
             # Whether or not we are building the Ash shell.
             'use_ash%': 0,
 
-            # Whether or not we are building the Athena shell.
-            'use_athena%': 0,
-
             # Whether or not we are using CRAS, the ChromeOS Audio Server.
             'use_cras%': 0,
 
@@ -56,7 +53,6 @@
           'chromecast%': '<(chromecast)',
           'use_aura%': '<(use_aura)',
           'use_ash%': '<(use_ash)',
-          'use_athena%': '<(use_athena)',
           'use_cras%': '<(use_cras)',
           'use_ozone%': '<(use_ozone)',
           'embedded%': '<(embedded)',
@@ -137,7 +133,6 @@
         'desktop_linux%': '<(desktop_linux)',
         'use_aura%': '<(use_aura)',
         'use_ash%': '<(use_ash)',
-        'use_athena%': '<(use_athena)',
         'use_cras%': '<(use_cras)',
         'use_ozone%': '<(use_ozone)',
         'embedded%': '<(embedded)',
@@ -276,7 +271,6 @@
       'desktop_linux%': '<(desktop_linux)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
-      'use_athena%': '<(use_athena)',
       'use_cras%': '<(use_cras)',
       'use_ozone%': '<(use_ozone)',
       'use_ozone_evdev%': '<(use_ozone_evdev)',
@@ -1071,7 +1065,6 @@
     'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
     'use_aura%': '<(use_aura)',
     'use_ash%': '<(use_ash)',
-    'use_athena%': '<(use_athena)',
     'use_cras%': '<(use_cras)',
     'use_openssl%': '<(use_openssl)',
     'use_openssl_certs%': '<(use_openssl_certs)',
@@ -1207,6 +1200,9 @@
     'gomadir%': '<(gomadir)',
     'video_hole%': '<(video_hole)',
 
+    # Whether or not we are building the Athena shell.
+    'use_athena%': '0',
+
     # Use system protobuf instead of bundled one.
     'use_system_protobuf%': 0,
 
@@ -2567,9 +2563,6 @@
       ['use_ash==1', {
         'defines': ['USE_ASH=1'],
       }],
-      ['use_athena==1', {
-        'defines': ['USE_ATHENA=1'],
-      }],
       ['use_pango==1', {
         'defines': ['USE_PANGO=1'],
       }],