Remove remainder of Athena related code from Chrome.

This CL:
- Removes athena dependencies from build files for the chrome target
- Removes athena-specific files in chrome/

BUG=440818
TEST=None
R=sky,scottmg
TBR=jamescook (for change to comment in extensions/shell/browser/desktop_controller.h)

Review URL: https://codereview.chromium.org/855753004

Cr-Commit-Position: refs/heads/master@{#312282}

build/all.gyp

@@ -103,6 +103,7 @@
         ['OS!="ios" and OS!="android"', {
           'dependencies': [
             '../third_party/re2/re2.gyp:re2',
+            '../chrome/chrome.gyp:*',
             '../chrome/tools/profile_reset/jtl_compiler.gyp:*',
             '../cc/blink/cc_blink_tests.gyp:*',
             '../cc/cc_tests.gyp:*',
@@ -147,21 +148,6 @@
             '../v8/tools/gyp/v8.gyp:*',
             '<(libjpeg_gyp_path):*',
           ],
-          'conditions': [
-            ['use_athena==1' , {
-              'dependencies': [
-                 # Athena temporarily depends upon a subset of chrome. Since most
-                 # tests do not compile, we only include dependencies to tests we
-                 # want to build.
-                 '../chrome/chrome.gyp:chrome',
-                 '../chrome/chrome.gyp:browser_tests',
-              ]
-            }, {
-              'dependencies': [
-               '../chrome/chrome.gyp:*',
-              ],
-            }],
-          ],
         }],
         ['use_openssl==0 and (OS=="mac" or OS=="ios" or OS=="win")', {
           'dependencies': [
@@ -328,6 +314,9 @@
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:chromedriver_tests',
             '../chrome/chrome.gyp:chromedriver_unittests',
+            '../chrome/chrome.gyp:interactive_ui_tests',
+            '../chrome/chrome.gyp:sync_integration_tests',
+            '../chrome/chrome.gyp:unit_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../content/content_shell_and_tests.gyp:content_browsertests',
             '../content/content_shell_and_tests.gyp:content_shell',
@@ -353,15 +342,6 @@
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../tools/telemetry/telemetry.gyp:*',
           ],
-          'conditions': [
-            ['use_athena!=1', {
-              'dependencies' : [
-                '../chrome/chrome.gyp:interactive_ui_tests',
-                '../chrome/chrome.gyp:sync_integration_tests',
-                '../chrome/chrome.gyp:unit_tests',
-               ],
-            }],
-          ],
         }],
         ['OS=="win"', {
           'dependencies': [
@@ -1274,6 +1254,8 @@
             '../cc/cc_tests.gyp:cc_unittests',
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:chrome',
+            '../chrome/chrome.gyp:interactive_ui_tests',
+            '../chrome/chrome.gyp:unit_tests',
             '../components/components_tests.gyp:components_unittests',
             '../content/content_shell_and_tests.gyp:content_browsertests',
             '../content/content_shell_and_tests.gyp:content_unittests',
@@ -1300,12 +1282,6 @@
             'blink_tests',
           ],
           'conditions': [
-            ['use_athena!=1', {
-              'dependencies': [
-                '../chrome/chrome.gyp:interactive_ui_tests',
-                '../chrome/chrome.gyp:unit_tests',
-              ],
-            }],
             ['OS=="win"', {
               'dependencies': [
                 '../chrome/chrome.gyp:crash_service',
@@ -1370,19 +1346,13 @@
           'dependencies': [
             '../base/base.gyp:base_unittests_run',
             '../chrome/chrome.gyp:browser_tests_run',
+            '../chrome/chrome.gyp:interactive_ui_tests_run',
+            '../chrome/chrome.gyp:sync_integration_tests_run',
+            '../chrome/chrome.gyp:unit_tests_run',
             '../content/content_shell_and_tests.gyp:content_browsertests_run',
             '../content/content_shell_and_tests.gyp:content_unittests_run',
             '../net/net.gyp:net_unittests_run',
           ],
-          'conditions' : [
-            ['use_athena!=1', {
-              'dependencies': [
-                '../chrome/chrome.gyp:interactive_ui_tests_run',
-                '../chrome/chrome.gyp:sync_integration_tests_run',
-                '../chrome/chrome.gyp:unit_tests_run',
-              ],
-            }],
-          ],
         }, # target_name: chromium_swarm_tests
       ],
     }],

build/common.gypi

@@ -1199,9 +1199,6 @@
     'support_pre_M6_history_database%': '<(support_pre_M6_history_database)',
     'v8_use_external_startup_data%': '<(v8_use_external_startup_data)',
 
-    # Whether or not we are building the Athena shell.
-    'use_athena%': '0',
-
     # Use system protobuf instead of bundled one.
     'use_system_protobuf%': 0,
 

build/config/BUILD.gn

@@ -196,9 +196,6 @@ config("feature_flags") {
   if (enable_one_click_signin) {
     defines += [ "ENABLE_ONE_CLICK_SIGNIN" ]
   }
-  if (use_athena) {
-    defines += [ "USE_ATHENA=1" ]
-  }
   if (enable_hidpi) {
     defines += [ "ENABLE_HIDPI=1" ]
   }

build/config/ui.gni

@@ -59,6 +59,4 @@ use_ozone_evdev = use_ozone
 
 use_clipboard_aurax11 = is_linux && use_aura && use_x11
 
-use_athena = false
-
 enable_hidpi = is_mac || is_chromeos || is_win

chrome/BUILD.gn

@@ -485,10 +485,6 @@ template("chrome_repack_percent") {
           [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]
       deps += [ "//ash/resources" ]
     }
-    if (use_athena) {
-      sources += [ "$root_gen_dir/athena/resources/athena_resources_${percent}_percent.pak" ]
-      deps += [ "//athena/resources" ]
-    }
     if (is_chromeos) {
       sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${percent}_percent.pak" ]
       deps += [ "//ui/chromeos/resources" ]

chrome/browser/extensions/BUILD.gn

@@ -110,17 +110,6 @@ static_library("extensions") {
       "api/tabs/ash_panel_contents.h",
     ]
   }
-  if (use_athena) {
-    defines += [ USE_ATHENA ]
-    sources += rebase_path(gypi_values.chrome_browser_extensions_athena_sources,
-                           ".",
-                           "//chrome")
-  } else {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_extensions_non_athena_sources,
-                    ".",
-                    "//chrome")
-  }
 
   if (is_linux) {
     configs += [ "//build/config/linux:fontconfig" ]