Merge BorderContentsView into BubbleFrameView; simplify.

ui/views/views.gyp

 # Copyright (c) 2011 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': [
@@ skipping 37 matching lines @@
         'accessibility/native_view_accessibility_win.cc',
         'accessibility/native_view_accessibility_win.h',
         'accessible_pane_view.cc',
         'accessible_pane_view.h',
         'animation/bounds_animator.cc',
         'animation/bounds_animator.h',
         'background.cc',
         'background.h',
         'border.cc',
         'border.h',
-        'bubble/border_contents_view.cc',
-        'bubble/border_contents_view.h',
         'bubble/bubble_border.cc',
         'bubble/bubble_border.h',
         'bubble/bubble_delegate.cc',
         'bubble/bubble_delegate.h',
         'bubble/bubble_frame_view.cc',
         'bubble/bubble_frame_view.h',
         'context_menu_controller.h',
         'controls/button/button.cc',
         'controls/button/button.h',
         'controls/button/button_dropdown.cc',
@@ skipping 431 matching lines @@
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'accessible_pane_view_unittest.cc',
         'animation/bounds_animator_unittest.cc',
-        'bubble/border_contents_unittest.cc',
         'bubble/bubble_delegate_unittest.cc',
         'bubble/bubble_frame_view_unittest.cc',
         'controls/combobox/native_combobox_views_unittest.cc',
         'controls/label_unittest.cc',
         'controls/menu/menu_model_adapter_unittest.cc',
         'controls/progress_bar_unittest.cc',
         'controls/scrollbar/scrollbar_unittest.cc',
         'controls/single_split_view_unittest.cc',
         'controls/tabbed_pane/tabbed_pane_unittest.cc',
         'controls/table/table_view_unittest.cc',
@@ skipping 220 matching lines @@
           'msvs_settings': {
             'VCManifestTool': {
               'AdditionalManifestFiles': 'examples\\views_examples.exe.manifest',
             },
           },
         }],
       ],
     },  # target_name: views_examples_lib
   ],
 }