| OLD | NEW | 
|     1 # Copyright 2014 The Chromium Authors. All rights reserved. |     1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
|     2 # Use of this source code is governed by a BSD-style license that can be |     2 # Use of this source code is governed by a BSD-style license that can be | 
|     3 # found in the LICENSE file. |     3 # found in the LICENSE file. | 
|     4  |     4  | 
|     5 import("//build/config/chrome_build.gni") |     5 import("//build/config/chrome_build.gni") | 
|     6 import("//build/config/compiler/compiler.gni") |     6 import("//build/config/compiler/compiler.gni") | 
|     7 import("//build/config/crypto.gni") |     7 import("//build/config/crypto.gni") | 
|     8 import("//build/config/features.gni") |     8 import("//build/config/features.gni") | 
|     9 import("//build/config/ui.gni") |     9 import("//build/config/ui.gni") | 
|    10 import("//chrome/common/features.gni") |    10 import("//chrome/common/features.gni") | 
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   675         sources -= [ |   675         sources -= [ | 
|   676           # These tests are failing on official cros bots. crbug.com/431450. |   676           # These tests are failing on official cros bots. crbug.com/431450. | 
|   677           "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", |   677           "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | 
|   678         ] |   678         ] | 
|   679       } |   679       } | 
|   680     } else {  # ! is_chromeos |   680     } else {  # ! is_chromeos | 
|   681       # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform |   681       # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform | 
|   682       # panels). |   682       # panels). | 
|   683       sources += [ |   683       sources += [ | 
|   684         "../browser/notifications/notification_interactive_uitest.cc", |   684         "../browser/notifications/notification_interactive_uitest.cc", | 
 |   685         "../browser/notifications/notification_interactive_uitest_mac.mm", | 
 |   686         "../browser/notifications/notification_interactive_uitest_support.cc", | 
|   685         "../browser/notifications/platform_notification_service_interactive_uite
      st.cc", |   687         "../browser/notifications/platform_notification_service_interactive_uite
      st.cc", | 
|   686       ] |   688       ] | 
|   687     } |   689     } | 
|   688  |   690  | 
|   689     if (is_win) { |   691     if (is_win) { | 
|   690       sources += [ |   692       sources += [ | 
|   691         "../browser/downgrade/user_data_downgrade_browsertest.cc", |   693         "../browser/downgrade/user_data_downgrade_browsertest.cc", | 
|   692         "//ui/resources/cursors/aliasb.cur", |   694         "//ui/resources/cursors/aliasb.cur", | 
|   693         "//ui/resources/cursors/cell.cur", |   695         "//ui/resources/cursors/cell.cur", | 
|   694         "//ui/resources/cursors/col_resize.cur", |   696         "//ui/resources/cursors/col_resize.cur", | 
| (...skipping 3807 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4502       "../tools/convert_dict/convert_dict_unittest.cc", |  4504       "../tools/convert_dict/convert_dict_unittest.cc", | 
|  4503     ] |  4505     ] | 
|  4504  |  4506  | 
|  4505     # The test fetches resources which means Mac need the app bundle to exist |  4507     # The test fetches resources which means Mac need the app bundle to exist | 
|  4506     # on disk so it can pull from it. |  4508     # on disk so it can pull from it. | 
|  4507     deps += [ |  4509     deps += [ | 
|  4508       "//third_party/google_toolbox_for_mac", |  4510       "//third_party/google_toolbox_for_mac", | 
|  4509       "//third_party/ocmock", |  4511       "//third_party/ocmock", | 
|  4510     ] |  4512     ] | 
|  4511  |  4513  | 
|  4512     sources += [ |  4514     sources += | 
|  4513       "../browser/ui/cocoa/applescript/apple_event_util_unittest.mm", |  4515         [ "../browser/ui/cocoa/applescript/apple_event_util_unittest.mm" ] | 
|  4514     ] |  | 
|  4515  |  4516  | 
|  4516     if (mac_views_browser) { |  4517     if (mac_views_browser) { | 
|  4517       # TODO(tapted): Add chrome_unit_tests_views_non_mac_sources. |  4518       # TODO(tapted): Add chrome_unit_tests_views_non_mac_sources. | 
|  4518     } else { |  4519     } else { | 
|  4519       sources += [ |  4520       sources += [ | 
|  4520         "../browser/ui/cocoa/accelerators_cocoa_unittest.mm", |  4521         "../browser/ui/cocoa/accelerators_cocoa_unittest.mm", | 
|  4521         "../browser/ui/cocoa/animatable_image_unittest.mm", |  4522         "../browser/ui/cocoa/animatable_image_unittest.mm", | 
|  4522         "../browser/ui/cocoa/animatable_view_unittest.mm", |  4523         "../browser/ui/cocoa/animatable_view_unittest.mm", | 
|  4523         "../browser/ui/cocoa/app_menu/app_menu_button_cell_unittest.mm", |  4524         "../browser/ui/cocoa/app_menu/app_menu_button_cell_unittest.mm", | 
|  4524         "../browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm", |  4525         "../browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm", | 
| (...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  5182 } |  5183 } | 
|  5183  |  5184  | 
|  5184 if (is_win) { |  5185 if (is_win) { | 
|  5185   loadable_module("conflicts_dll") { |  5186   loadable_module("conflicts_dll") { | 
|  5186     testonly = true |  5187     testonly = true | 
|  5187     sources = [ |  5188     sources = [ | 
|  5188       "conflicts/conflicts_dll.cc", |  5189       "conflicts/conflicts_dll.cc", | 
|  5189     ] |  5190     ] | 
|  5190   } |  5191   } | 
|  5191 } |  5192 } | 
| OLD | NEW |