Reland Merge NativeTextfieldViews into views::Textfield.

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 199 matching lines @@
         'controls/tabbed_pane/tabbed_pane.h',
         'controls/tabbed_pane/tabbed_pane_listener.h',
         'controls/table/table_header.cc',
         'controls/table/table_header.h',
         'controls/table/table_utils.cc',
         'controls/table/table_utils.h',
         'controls/table/table_view.cc',
         'controls/table/table_view.h',
         'controls/table/table_view_observer.h',
         'controls/table/table_view_row_background_painter.h',
-        'controls/textfield/native_textfield_views.cc',
-        'controls/textfield/native_textfield_views.h',
         'controls/textfield/textfield.cc',
         'controls/textfield/textfield.h',
         'controls/textfield/textfield_controller.cc',
         'controls/textfield/textfield_controller.h',
         'controls/textfield/textfield_views_model.cc',
         'controls/textfield/textfield_views_model.h',
         'controls/throbber.cc',
         'controls/throbber.h',
         'controls/tree/tree_view.cc',
         'controls/tree/tree_view.h',
@@ skipping 522 matching lines @@
         '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',
         'controls/table/table_utils_unittest.cc',
         'controls/table/table_view_unittest.cc',
         'controls/table/test_table_model.cc',
         'controls/table/test_table_model.h',
-        'controls/textfield/native_textfield_views_unittest.cc',
+        'controls/textfield/textfield_unittest.cc',
         'controls/textfield/textfield_views_model_unittest.cc',
         'controls/tree/tree_view_unittest.cc',
         'corewm/capture_controller_unittest.cc',
         'corewm/compound_event_filter_unittest.cc',
         'corewm/cursor_manager_unittest.cc',
         'corewm/focus_controller_unittest.cc',
         'corewm/image_grid_unittest.cc',
         'corewm/input_method_event_filter_unittest.cc',
         'corewm/shadow_controller_unittest.cc',
         'corewm/tooltip_aura_unittest.cc',
@@ skipping 354 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
   ],
 }