[Media Router] Implement MediaRouterAction + MediaRouterUI tests.

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 600 matching lines @@
       'browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h',
       'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc',
       'browser/ui/views/autofill/password_generation_popup_view_tester_views.h',
       'browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc',
       'browser/ui/views/collected_cookies_views_browsertest.cc',
       'browser/ui/views/extensions/bookmark_override_browsertest.cc',
       'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
       'browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc',
       'browser/ui/views/frame/browser_view_browsertest.cc',
       'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
+      'browser/ui/views/media_router/media_router_ui_browsertest.cc',
       'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
       'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
       'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
       'browser/ui/views/toolbar/toolbar_view_browsertest.cc',
       'browser/ui/views/translate/translate_bubble_view_browsertest.cc',
       'browser/ui/views/web_dialog_view_browsertest.cc',
     ],
     'chrome_browser_tests_chromeos_sources': [
       'browser/chromeos/accessibility/accessibility_manager_browsertest.cc',
       'browser/chromeos/accessibility/magnification_manager_browsertest.cc',
@@ skipping 1613 matching lines @@
         }],
         ['enable_webrtc==0', {
           'sources!': [
             'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc',
             'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc',
             'browser/media/chrome_webrtc_browsertest.cc',
             'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc',
             'browser/media/chrome_webrtc_getmediadevices_browsertest.cc',
          ],
         }],
-        ['enable_media_router==1', {
-          'sources': [ '<@(chrome_browser_tests_media_router_sources)' ],
-          'dependencies': [ 'browser/media/router/media_router.gyp:media_router_test_support' ],
-        }],
         ['OS=="win"', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             'chrome_version_resources',
@@ skipping 168 matching lines @@
             'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
             'browser/printing/print_preview_dialog_controller_browsertest.cc',
             'browser/printing/print_preview_pdf_generated_browsertest.cc',
             'browser/service_process/service_process_control_browsertest.cc',
             'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc',
             'test/data/webui/print_preview.cc',
             'test/data/webui/print_preview.h',
             'test/data/webui/print_preview.js',
           ],
         }],
+        ['enable_media_router==1', {

[Jay Civelli, 2015/06/04 15:45:19]

Any specific reason why this was moved here?

[imcheng (use chromium acct), 2015/06/04 16:30:43]

This was moved here so that it is parsed after the tookit_views conditions in
L2390-L2402. The media router test included in
chrome_browser_tests_views_non_mac_sources there will be removed here if
enable_media_router is not defined.

+          'sources': [ '<@(chrome_browser_tests_media_router_sources)' ],
+          'dependencies': [ 'browser/media/router/media_router.gyp:media_router_test_support' ],
+          'conditions': [
+            ['toolkit_views==0', {
+              'sources!': [ 'browser/ui/views/media_router/media_router_ui_browsertest.cc' ],
+            }],
+          ],
+        }],
         ['enable_mdns==1', {
           'sources' : [
             'browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc',
           ]
         }],
         [ 'use_brlapi==0', {
           'sources!': [
             'browser/extensions/api/braille_display_private/braille_display_private_apitest.cc'
             ]
         }],
@@ skipping 812 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }