Merge 167819 - Fix crash when programatically closing media gallery dialog

chrome/chrome_tests.gypi

 # Copyright (c) 2012 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 3065 matching lines @@
         'browser/history/redirect_browsertest.cc',
         'browser/history/top_sites_extension_test.cc',
         'browser/iframe_browsertest.cc',
         'browser/infobars/infobars_browsertest.cc',
         'browser/infobars/infobar_extension_apitest.cc',
         'browser/importer/toolbar_importer_utils_browsertest.cc',
         'browser/intents/native_services_browsertest.cc',
         'browser/loadtimes_extension_bindings_browsertest.cc',
         'browser/locale_tests_browsertest.cc',
         'browser/logging_chrome_browsertest.cc',
+        'browser/media_gallery/media_galleries_dialog_controller_mock.cc',
+        'browser/media_gallery/media_galleries_dialog_controller_mock.h',
         'browser/metrics/metrics_service_browsertest.cc',
         'browser/net/cookie_policy_browsertest.cc',
         'browser/net/ftp_browsertest.cc',
         'browser/net/load_timing_observer_browsertest.cc',
         'browser/net/predictor_browsertest.cc',
         'browser/net/proxy_browsertest.cc',
         'browser/notifications/desktop_notifications_unittest.cc',
         'browser/notifications/desktop_notifications_unittest.h',
         'browser/notifications/notification_browsertest.cc',
         'browser/page_cycler/page_cycler_browsertest.cc',
@@ skipping 58 matching lines @@
         'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm',
         'browser/ui/cocoa/view_id_util_browsertest.mm',
         'browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm',
         'browser/ui/cocoa/applescript/window_applescript_test.mm',
         'browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm',
         'browser/ui/cocoa/browser_window_controller_browsertest.mm',
         'browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm',
         'browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm',
         'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h',
         'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm',
+        'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm',
         'browser/ui/cocoa/intents/web_intent_inline_service_view_controller_browsertest.mm',
         'browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm',
         'browser/ui/find_bar/find_bar_host_browsertest.cc',
         'browser/ui/fullscreen/fullscreen_controller_browsertest.cc',
         'browser/ui/global_error/global_error_service_browsertest.cc',
         'browser/ui/gtk/bubble/bubble_gtk_browsertest.cc',
         'browser/ui/gtk/confirm_bubble_gtk_browsertest.cc',
         'browser/ui/gtk/location_bar_view_gtk_browsertest.cc',
         'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc',
         'browser/ui/gtk/view_id_util_browsertest.cc',
@@ skipping 1785 matching lines @@
             'sync_integration_tests.isolate',
           ],
           'sources': [
             'sync_integration_tests.isolate',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }