Merge 269819 "views: Terminate the nested message-loop correctly..."

ui/views/views.gyp

 # 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': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'conditions': [
       ['use_aura==1', {
@@ skipping 605 matching lines @@
         'bubble/bubble_delegate_unittest.cc',
         'bubble/bubble_frame_view_unittest.cc',
         'bubble/bubble_window_targeter_unittest.cc',
         'controls/button/blue_button_unittest.cc',
         'controls/button/custom_button_unittest.cc',
         'controls/button/image_button_unittest.cc',
         'controls/button/label_button_unittest.cc',
         'controls/combobox/combobox_unittest.cc',
         'controls/label_unittest.cc',
         'controls/menu/menu_model_adapter_unittest.cc',
+        'controls/menu/menu_controller_unittest.cc',
         'controls/native/native_view_host_aura_unittest.cc',
         'controls/native/native_view_host_unittest.cc',
         'controls/prefix_selector_unittest.cc',
         'controls/progress_bar_unittest.cc',
         'controls/scrollbar/scrollbar_unittest.cc',
         'controls/scroll_view_unittest.cc',
         'controls/single_split_view_unittest.cc',
         'controls/slider_unittest.cc',
         'controls/styled_label_unittest.cc',
         'controls/tabbed_pane/tabbed_pane_unittest.cc',
@@ skipping 81 matching lines @@
         }],
         ['use_aura==1', {
           'dependencies': [
             '../aura/aura.gyp:aura_test_support',
           ],
         }],
       ],
     },  # target_name: views_unittests
   ],
 }