Consolidate bubble border code.

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': [
@@ skipping 40 matching lines @@
         'background.cc',
         'background.h',
         'border.cc',
         'border.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',
-        'bubble/bubble_border_2.cc',
-        'bubble/bubble_border_2.h',
         'button_drag_utils.cc',
         'button_drag_utils.h',
         'color_chooser/color_chooser_listener.h',
         'color_chooser/color_chooser_view.cc',
         'color_chooser/color_chooser_view.h',
         'color_constants.cc',
         'color_constants.h',
         'context_menu_controller.h',
         'controls/button/button.cc',
         'controls/button/button.h',
@@ skipping 461 matching lines @@
         '../ui.gyp:ui_test_support',
         'test_support_views',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'accessible_pane_view_unittest.cc',
         'animation/bounds_animator_unittest.cc',
+        'bubble/bubble_border_unittest.cc',
         'bubble/bubble_delegate_unittest.cc',
         'bubble/bubble_frame_view_unittest.cc',
         'controls/button/image_button_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/slider_unittest.cc',
@@ skipping 286 matching lines @@
           'sources/': [
             # This is needed because the aura rule strips it from the default
             # sources list.
             ['include', '^../../content/app/startup_helper_win.cc'],
           ],
         }],
       ],
     },  # target_name: views_examples_with_content_exe
   ],
 }