Adding application lifetime tests to athena, allowing to override focus request for applciations

chrome/chrome_tests.gypi

 # Copyright 2013 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.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',   
       'browser/extensions/browsertest_util.cc',
@@ skipping 1832 matching lines @@
         }],
         ['use_athena==1', {
           'dependencies': [
             '../dbus/dbus.gyp:dbus_test_support',
             '../build/linux/system.gyp:dbus',
             '../ui/login/login.gyp:login_resources',
             '../athena/resources/athena_resources.gyp:athena_pak',
           ],
           'sources!': [
              '<@(chrome_browser_tests_sources)',
-             'browser/extensions/api/networking_private/networking_private_apitest.cc',
           ],
           'sources': [
             '../athena/test/base/activity_lifetime_tracker.h',
             '../athena/test/base/activity_lifetime_tracker.cc',
             '../athena/test/chrome/athena_app_browsertest.cc',
             '../athena/test/chrome/athena_app_browsertest.h',
             '../athena/test/chrome/athena_browsertest.cc',
             '../athena/test/chrome/athena_browsertest.h',
             '../athena/test/chrome/test_util.cc',
             '../athena/test/chrome/test_util.h',
@@ skipping 219 matching lines @@
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['OS=="win" or OS == "mac"', {
           'dependencies': [
             '../components/components.gyp:wifi_test_support',
           ],
         }],
-        ['chromeos == 1', {
+        ['chromeos == 1 and use_athena == 0', {
           'sources': [
             'browser/extensions/api/networking_private/networking_private_apitest.cc',
             'browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc',
           ],
         }],
         ['OS=="win" or OS == "mac"', {
           'sources': [
             'browser/extensions/api/networking_private/networking_private_apitest.cc',
             'browser/extensions/api/networking_private/networking_private_service_client_apitest.cc',
           ],
@@ skipping 1023 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }