views: Move textfield directory to ui/views/controls/.

BUG=104039
R=maruel@chromium.org
TBR=ben@chromium.org

Review URL: http://codereview.chromium.org/8713004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111660 0039d316-1c4b-4281-b951-d872f2087c98

73 files changed, 149 insertions, 149 deletions

diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
index b60a92e..b1416ed 100644
--- a/chrome/browser/chromeos/input_method/candidate_window.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window.cc
@@ -23,13 +23,13 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/events/event.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 namespace chromeos {
 namespace input_method {
diff --git a/chrome/browser/chromeos/login/captcha_view.cc b/chrome/browser/chromeos/login/captcha_view.cc
index fa3211b..6e283db 100644
--- a/chrome/browser/chromeos/login/captcha_view.cc
+++ b/chrome/browser/chromeos/login/captcha_view.cc
@@ -15,6 +15,7 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
@@ -22,7 +23,6 @@
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 using views::Label;
 using views::Textfield;
diff --git a/chrome/browser/chromeos/login/captcha_view.h b/chrome/browser/chromeos/login/captcha_view.h
index 5eacca3..181bad5 100644
--- a/chrome/browser/chromeos/login/captcha_view.h
+++ b/chrome/browser/chromeos/login/captcha_view.h
@@ -11,9 +11,9 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/image_decoder.h"
 #include "googleurl/src/gurl.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/controls/button/button.h"
-#include "views/controls/textfield/textfield_controller.h"
 
 namespace views {
 class ImageView;
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index 8638bc6..c8892e1 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -16,10 +16,10 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 #include "views/controls/throbber.h"
 #include "views/painter.h"
 
diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc
index 5598075..b306acc 100644
--- a/chrome/browser/chromeos/login/password_changed_view.cc
+++ b/chrome/browser/chromeos/login/password_changed_view.cc
@@ -13,12 +13,12 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 using views::Button;
 using views::GridLayout;
diff --git a/chrome/browser/chromeos/login/password_changed_view.h b/chrome/browser/chromeos/login/password_changed_view.h
index a5936d9..4bf2866 100644
--- a/chrome/browser/chromeos/login/password_changed_view.h
+++ b/chrome/browser/chromeos/login/password_changed_view.h
@@ -9,9 +9,9 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/controls/button/button.h"
-#include "views/controls/textfield/textfield_controller.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc
index d80ab03..98aef5f 100644
--- a/chrome/browser/chromeos/login/screen_lock_view.cc
+++ b/chrome/browser/chromeos/login/screen_lock_view.cc
@@ -19,14 +19,14 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/textfield/native_textfield_wrapper.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/native_widget_gtk.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/native_textfield_wrapper.h"
-#include "views/controls/textfield/textfield.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/screen_lock_view.h b/chrome/browser/chromeos/login/screen_lock_view.h
index 681b010..3c49547 100644
--- a/chrome/browser/chromeos/login/screen_lock_view.h
+++ b/chrome/browser/chromeos/login/screen_lock_view.h
@@ -11,7 +11,7 @@
 #include "chrome/browser/chromeos/login/user_view.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "views/controls/textfield/textfield_controller.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "views/view.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index 50f53db..d7a7b89 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -22,8 +22,8 @@
 #include "content/public/browser/notification_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/native_widget_gtk.h"
-#include "views/controls/textfield/textfield.h"
 
 namespace {
 
diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc
index 6e9c078..c0a06360 100644
--- a/chrome/browser/chromeos/login/screen_locker_tester.cc
+++ b/chrome/browser/chromeos/login/screen_locker_tester.cc
@@ -12,11 +12,11 @@
 #include "chrome/browser/chromeos/login/screen_lock_view.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/screen_locker_views.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/events/event.h"
 #include "ui/views/widget/root_view.h"
 #include "views/controls/button/button.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/textfield_with_margin.h b/chrome/browser/chromeos/login/textfield_with_margin.h
index ac76a09..beb2263 100644
--- a/chrome/browser/chromeos/login/textfield_with_margin.h
+++ b/chrome/browser/chromeos/login/textfield_with_margin.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/compiler_specific.h"
-#include "views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index 4c09e36..2e31806 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -18,10 +18,10 @@
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 namespace {
 
diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h
index 7285c34..275f661 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.h
+++ b/chrome/browser/chromeos/options/vpn_config_view.h
@@ -13,8 +13,8 @@
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/ui/select_file_dialog.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "views/controls/button/button.h"
-#include "views/controls/textfield/textfield_controller.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 0d993de..b4e6664 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -16,12 +16,12 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index 8e337fa..02b0400 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -16,8 +16,8 @@
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "views/controls/button/button.h"
-#include "views/controls/textfield/textfield_controller.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
index a33f839..cf965ae 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
@@ -49,8 +49,8 @@
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/events/event.h"
-#include "views/controls/textfield/native_textfield_views.h"
 #else
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
diff --git a/chrome/browser/ui/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc
index 6dbd92c2..e406d70 100644
--- a/chrome/browser/ui/input_window_dialog_win.cc
+++ b/chrome/browser/ui/input_window_dialog_win.cc
@@ -13,13 +13,13 @@
 #include "chrome/browser/ui/webui/input_window_dialog_webui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/controls/textfield/textfield_controller.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 372a36f..6c355bc 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -43,9 +43,9 @@
 #endif
 
 #if defined(TOOLKIT_VIEWS)
+#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/events/event.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/textfield/native_textfield_views.h"
 #endif
 
 using base::Time;
diff --git a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
index b29a917..4723d0b 100644
--- a/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browser_view_browsertest.cc
@@ -17,15 +17,15 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/animation/slide_animation.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
-#include "views/controls/textfield/textfield.h"
 
 class PanelBrowserViewTest : public BasePanelBrowserTest {
  public:
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index 87074bd..106c48d 100644
--- a/chrome/browser/ui/views/about_chrome_view.cc
+++ b/chrome/browser/ui/views/about_chrome_view.cc
@@ -34,11 +34,11 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/link.h"
-#include "views/controls/textfield/textfield.h"
 #include "views/controls/throbber.h"
 #include "views/view_text_utils.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index e486518..82b3824 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -24,6 +24,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/events/event.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
@@ -31,7 +32,6 @@
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
-#include "views/controls/textfield/textfield.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index 35c54d8..0fcdea7 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -23,6 +23,7 @@
 #include "grit/locale_settings.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
@@ -31,7 +32,6 @@
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_2.h"
-#include "views/controls/textfield/textfield.h"
 
 using views::GridLayout;
 
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
index f884107..a56abbb 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -16,12 +16,12 @@
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/models/tree_node_model.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/context_menu_controller.h"
 #include "views/controls/button/button.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/controls/textfield/textfield_controller.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
index 6f7e580..ad1fd7c 100644
--- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc
+++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc
@@ -10,10 +10,10 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/base/accelerators/accelerator.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/controls/textfield/textfield.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index 4bc8fb4..d2ec8d6 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -18,12 +18,12 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/combobox/combobox.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/border.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 static const int kCookieInfoViewBorderSize = 1;
 static const int kCookieInfoViewInsetSize = 3;
diff --git a/chrome/browser/ui/views/database_info_view.cc b/chrome/browser/ui/views/database_info_view.cc
index b8efe0a..6ce812d 100644
--- a/chrome/browser/ui/views/database_info_view.cc
+++ b/chrome/browser/ui/views/database_info_view.cc
@@ -12,10 +12,10 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 static const int kDatabaseInfoViewBorderSize = 1;
 static const int kDatabaseInfoViewInsetSize = 3;
diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h
index e848e42..ba809dd 100644
--- a/chrome/browser/ui/views/dropdown_bar_host.h
+++ b/chrome/browser/ui/views/dropdown_bar_host.h
@@ -12,8 +12,8 @@
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager.h"
-#include "views/controls/textfield/textfield.h"
 
 class BrowserView;
 class DropdownBarHostDelegate;
diff --git a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
index dfbdadd..bb47ea7 100644
--- a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
@@ -8,8 +8,8 @@
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/textfield/textfield.h"
 
 void DropdownBarHost::SetWidgetPositionNative(const gfx::Rect& new_pos,
                                               bool no_redraw) {
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc
index c9ac777..c410c03 100644
--- a/chrome/browser/ui/views/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc
@@ -16,12 +16,12 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/table/table_view.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 using views::GridLayout;
 using views::ImageView;
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.h b/chrome/browser/ui/views/edit_search_engine_dialog.h
index 33df554..460aee5 100644
--- a/chrome/browser/ui/views/edit_search_engine_dialog.h
+++ b/chrome/browser/ui/views/edit_search_engine_dialog.h
@@ -13,8 +13,8 @@
 
 #include <windows.h>
 
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/window/dialog_delegate.h"
-#include "views/controls/textfield/textfield_controller.h"
 
 namespace views {
 class Label;
diff --git a/chrome/browser/ui/views/find_bar_host.h b/chrome/browser/ui/views/find_bar_host.h
index f6d18d2..20d4f98 100644
--- a/chrome/browser/ui/views/find_bar_host.h
+++ b/chrome/browser/ui/views/find_bar_host.h
@@ -12,7 +12,7 @@
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
-#include "views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield.h"
 
 class BrowserView;
 class FindBarController;
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index 9c245f5..1313423 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -26,11 +26,11 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
 #include "views/background.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 // The amount of whitespace to have before the find button.
 static const int kWhiteSpaceAfterMatchCountLabel = 1;
diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h
index 86d9cb3..68f40aa 100644
--- a/chrome/browser/ui/views/find_bar_view.h
+++ b/chrome/browser/ui/views/find_bar_view.h
@@ -11,9 +11,9 @@
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
 #include "ui/gfx/size.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "views/controls/button/button.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/controls/textfield/textfield_controller.h"
 
 class FindBarHost;
 
diff --git a/chrome/browser/ui/views/generic_info_view.cc b/chrome/browser/ui/views/generic_info_view.cc
index 1a0be5a..caedcf2 100644
--- a/chrome/browser/ui/views/generic_info_view.cc
+++ b/chrome/browser/ui/views/generic_info_view.cc
@@ -8,10 +8,10 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 GenericInfoView::GenericInfoView(int number_of_rows)
     : number_of_rows_(number_of_rows), name_string_ids_(NULL) {
diff --git a/chrome/browser/ui/views/generic_info_view_unittest.cc b/chrome/browser/ui/views/generic_info_view_unittest.cc
index 26d78a7..f3aa49c 100644
--- a/chrome/browser/ui/views/generic_info_view_unittest.cc
+++ b/chrome/browser/ui/views/generic_info_view_unittest.cc
@@ -9,9 +9,9 @@
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 // This class is only used on windows for now.
 #if defined(OS_WIN)
diff --git a/chrome/browser/ui/views/indexed_db_info_view.cc b/chrome/browser/ui/views/indexed_db_info_view.cc
index 93c2f45..fa451af 100644
--- a/chrome/browser/ui/views/indexed_db_info_view.cc
+++ b/chrome/browser/ui/views/indexed_db_info_view.cc
@@ -12,10 +12,10 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 static const int kIndexedDBInfoViewBorderSize = 1;
 static const int kIndexedDBInfoViewInsetSize = 3;
diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc
index 3b76003..827b1e0 100644
--- a/chrome/browser/ui/views/js_modal_dialog_views.cc
+++ b/chrome/browser/ui/views/js_modal_dialog_views.cc
@@ -11,9 +11,9 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/message_box_flags.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/message_box_view.h"
-#include "views/controls/textfield/textfield.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // JSModalDialogViews, public:
diff --git a/chrome/browser/ui/views/local_storage_info_view.cc b/chrome/browser/ui/views/local_storage_info_view.cc
index b3ce310..19c21b8 100644
--- a/chrome/browser/ui/views/local_storage_info_view.cc
+++ b/chrome/browser/ui/views/local_storage_info_view.cc
@@ -12,10 +12,10 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 static const int kLocalStorageInfoViewBorderSize = 1;
 static const int kLocalStorageInfoViewInsetSize = 3;
diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.cc b/chrome/browser/ui/views/local_storage_set_item_info_view.cc
index 94d66b2..e9e19a2 100644
--- a/chrome/browser/ui/views/local_storage_set_item_info_view.cc
+++ b/chrome/browser/ui/views/local_storage_set_item_info_view.cc
@@ -10,10 +10,10 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 static const int kLocalStorageSetItemInfoViewBorderSize = 1;
 static const int kLocalStorageSetItemInfoViewInsetSize = 3;
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index dfbe933..2c7f34f 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -56,8 +56,8 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/native_textfield_views.h"
 #include "views/drag_utils.h"
 
 #if !defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc
index 7117658..0e3cbe0 100644
--- a/chrome/browser/ui/views/login_view.cc
+++ b/chrome/browser/ui/views/login_view.cc
@@ -11,11 +11,11 @@
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/root_view.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 
 static const int kMessageWidth = 320;
 static const int kTextfieldStackHorizontalSpacing = 30;
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 0b958c0..549825d 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -27,10 +27,10 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/events/event.h"
 #include "ui/views/layout/fill_layout.h"
 #include "views/border.h"
-#include "views/controls/textfield/textfield.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
index 133fca0..a3627ac 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -15,7 +15,7 @@
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "content/public/browser/notification_observer.h"
 #include "ui/base/range/range.h"
-#include "views/controls/textfield/textfield_controller.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index cce7d39..fd0ca98 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -52,8 +52,8 @@
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/views/controls/textfield/native_textfield_win.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/textfield/native_textfield_win.h"
 #include "views/drag_utils.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
diff --git a/views/controls/textfield/gtk_views_entry.cc b/ui/views/controls/textfield/gtk_views_entry.cc
index d3a8bd0..d26e370 100644
--- a/views/controls/textfield/gtk_views_entry.cc
+++ b/ui/views/controls/textfield/gtk_views_entry.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "views/controls/textfield/gtk_views_entry.h"
+#include "ui/views/controls/textfield/gtk_views_entry.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/skia_utils_gtk.h"
-#include "views/controls/textfield/native_textfield_gtk.h"
-#include "views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/native_textfield_gtk.h"
+#include "ui/views/controls/textfield/textfield.h"
 
 G_BEGIN_DECLS
 
diff --git a/views/controls/textfield/gtk_views_entry.h b/ui/views/controls/textfield/gtk_views_entry.h
index aae80aa..1584165 100644
--- a/views/controls/textfield/gtk_views_entry.h
+++ b/ui/views/controls/textfield/gtk_views_entry.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef VIEWS_WIDGET_GTK_VIEWS_ENTRY_H_
-#define VIEWS_WIDGET_GTK_VIEWS_ENTRY_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_ENTRY_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_ENTRY_H_
 #pragma once
 
 #include <gdk/gdk.h>
@@ -50,4 +50,4 @@ GType gtk_views_entry_get_type();
 
 G_END_DECLS
 
-#endif  // VIEWS_WIDGET_GTK_VIEWS_ENTRY_H
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_ENTRY_H_
diff --git a/views/controls/textfield/gtk_views_textview.cc b/ui/views/controls/textfield/gtk_views_textview.cc
index a335072..8e4ca38 100644
--- a/views/controls/textfield/gtk_views_textview.cc
+++ b/ui/views/controls/textfield/gtk_views_textview.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "views/controls/textfield/gtk_views_textview.h"
+#include "ui/views/controls/textfield/gtk_views_textview.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/skia_utils_gtk.h"
-#include "views/controls/textfield/native_textfield_gtk.h"
-#include "views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/native_textfield_gtk.h"
+#include "ui/views/controls/textfield/textfield.h"
 
 G_BEGIN_DECLS
 
diff --git a/views/controls/textfield/gtk_views_textview.h b/ui/views/controls/textfield/gtk_views_textview.h
index 228a445..9c2e4e6 100644
--- a/views/controls/textfield/gtk_views_textview.h
+++ b/ui/views/controls/textfield/gtk_views_textview.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_TEXTVIEW_H_
-#define VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_TEXTVIEW_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_TEXTVIEW_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_TEXTVIEW_H_
 #pragma once
 
 #include <gdk/gdk.h>
@@ -51,4 +51,4 @@ GType gtk_views_textview_get_type();
 
 G_END_DECLS
 
-#endif  // VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_TEXTVIEW_H_
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_GTK_VIEWS_TEXTVIEW_H_
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/ui/views/controls/textfield/native_textfield_gtk.cc
index da96a37..3bab2a1 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/ui/views/controls/textfield/native_textfield_gtk.cc
@@ -5,7 +5,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "views/controls/textfield/native_textfield_gtk.h"
+#include "ui/views/controls/textfield/native_textfield_gtk.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ -14,12 +14,12 @@
 #include "ui/gfx/insets.h"
 #include "ui/gfx/selection_model.h"
 #include "ui/gfx/skia_utils_gtk.h"
+#include "ui/views/controls/textfield/gtk_views_entry.h"
+#include "ui/views/controls/textfield/gtk_views_textview.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/widget/native_widget_gtk.h"
-#include "views/controls/textfield/gtk_views_entry.h"
-#include "views/controls/textfield/gtk_views_textview.h"
-#include "views/controls/textfield/native_textfield_views.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/controls/textfield/textfield_controller.h"
 
 namespace views {
 
diff --git a/views/controls/textfield/native_textfield_gtk.h b/ui/views/controls/textfield/native_textfield_gtk.h
index 33b067e..ea3151c 100644
--- a/views/controls/textfield/native_textfield_gtk.h
+++ b/ui/views/controls/textfield/native_textfield_gtk.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_GTK_H_
-#define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_GTK_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_GTK_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include "base/string16.h"
 #include "ui/base/gtk/gtk_signal.h"
+#include "ui/views/controls/textfield/native_textfield_wrapper.h"
 #include "views/controls/native_control_gtk.h"
-#include "views/controls/textfield/native_textfield_wrapper.h"
 
 namespace gfx {
 class SelectionModel;
@@ -102,4 +102,4 @@ class NativeTextfieldGtk : public NativeControlGtk,
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_GTK_H_
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_GTK_H_
diff --git a/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index ac5b772..8cba8de 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/controls/textfield/native_textfield_views.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
@@ -18,6 +18,9 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
+#include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/events/event.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/widget/widget.h"
@@ -27,9 +30,6 @@
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/menu/menu_runner.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/controls/textfield/textfield_controller.h"
-#include "views/controls/textfield/textfield_views_model.h"
 #include "views/metrics.h"
 #include "views/views_delegate.h"
 
diff --git a/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h
index e287fe0..2cae9f4 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/ui/views/controls/textfield/native_textfield_views.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
-#define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 #pragma once
 
 #include "base/memory/weak_ptr.h"
@@ -11,11 +11,11 @@
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/font.h"
+#include "ui/views/controls/textfield/native_textfield_wrapper.h"
+#include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/touchui/touch_selection_controller.h"
 #include "views/border.h"
 #include "views/context_menu_controller.h"
-#include "views/controls/textfield/native_textfield_wrapper.h"
-#include "views/controls/textfield/textfield_views_model.h"
 #include "views/drag_controller.h"
 #include "views/view.h"
 
@@ -264,4 +264,4 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
index 7e8b3ef..1c15e7a 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc
@@ -21,6 +21,10 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
+#include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/events/event.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/ime/mock_input_method.h"
@@ -28,10 +32,6 @@
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/textfield/native_textfield_views.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/controls/textfield/textfield_controller.h"
-#include "views/controls/textfield/textfield_views_model.h"
 #include "views/views_delegate.h"
 
 // Drag and drop for aura in linux hasn't been implemented yet.
diff --git a/views/controls/textfield/native_textfield_wayland.cc b/ui/views/controls/textfield/native_textfield_wayland.cc
index d5869dc..63d02c7 100644
--- a/views/controls/textfield/native_textfield_wayland.cc
+++ b/ui/views/controls/textfield/native_textfield_wayland.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "views/controls/textfield/native_textfield_views.h"
-#include "views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
+#include "ui/views/controls/textfield/textfield.h"
 
 namespace views {
 
diff --git a/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
index aece2f8..0741fd6 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/ui/views/controls/textfield/native_textfield_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/controls/textfield/native_textfield_win.h"
+#include "ui/views/controls/textfield/native_textfield_win.h"
 
 #include <algorithm>
 
@@ -24,14 +24,14 @@
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/native_theme_win.h"
 #include "ui/views/controls/native/native_view_host.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/menu_win.h"
-#include "views/controls/textfield/native_textfield_views.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/controls/textfield/textfield_controller.h"
 #include "views/metrics.h"
 #include "views/views_delegate.h"
 
diff --git a/views/controls/textfield/native_textfield_win.h b/ui/views/controls/textfield/native_textfield_win.h
index 459c095..307060c 100644
--- a/views/controls/textfield/native_textfield_win.h
+++ b/ui/views/controls/textfield/native_textfield_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_
-#define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_
 #pragma once
 
 #include <atlbase.h>
@@ -19,7 +19,7 @@
 #include "base/win/scoped_comptr.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/insets.h"
-#include "views/controls/textfield/native_textfield_wrapper.h"
+#include "ui/views/controls/textfield/native_textfield_wrapper.h"
 
 namespace gfx {
 class SelectionModel;
@@ -291,4 +291,4 @@ class NativeTextfieldWin
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_
diff --git a/views/controls/textfield/native_textfield_wrapper.h b/ui/views/controls/textfield/native_textfield_wrapper.h
index f4439da..3bc3f1d 100644
--- a/views/controls/textfield/native_textfield_wrapper.h
+++ b/ui/views/controls/textfield/native_textfield_wrapper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
-#define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
 #pragma once
 
 #include "base/string16.h"
@@ -150,4 +150,4 @@ class VIEWS_EXPORT NativeTextfieldWrapper {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WRAPPER_H_
diff --git a/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index eca55bc..74395f2 100644
--- a/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdkkeysyms.h>
@@ -19,9 +19,9 @@
 #include "ui/gfx/insets.h"
 #include "ui/gfx/selection_model.h"
 #include "ui/views/controls/native/native_view_host.h"
+#include "ui/views/controls/textfield/native_textfield_wrapper.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/textfield/native_textfield_wrapper.h"
-#include "views/controls/textfield/textfield_controller.h"
 
 #if defined(OS_LINUX)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
@@ -29,8 +29,8 @@
 #include "base/win/win_util.h"
 // TODO(beng): this should be removed when the OS_WIN hack from
 // ViewHierarchyChanged is removed.
-#include "views/controls/textfield/native_textfield_views.h"
-#include "views/controls/textfield/native_textfield_win.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
+#include "ui/views/controls/textfield/native_textfield_win.h"
 #endif
 
 namespace views {
diff --git a/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h
index f6f3567..abdd590 100644
--- a/views/controls/textfield/textfield.h
+++ b/ui/views/controls/textfield/textfield.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
-#define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #pragma once
 
 #include "build/build_config.h"
@@ -18,7 +18,7 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_widget_types.h"
-#include "views/controls/textfield/native_textfield_wrapper.h"
+#include "ui/views/controls/textfield/native_textfield_wrapper.h"
 #include "views/view.h"
 
 #if !defined(OS_LINUX)
@@ -312,4 +312,4 @@ class VIEWS_EXPORT Textfield : public View {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
diff --git a/views/controls/textfield/textfield_controller.h b/ui/views/controls/textfield/textfield_controller.h
index a50f2e9..ef2bdda 100644
--- a/views/controls/textfield/textfield_controller.h
+++ b/ui/views/controls/textfield/textfield_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_CONTROLLER_H_
-#define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_CONTROLLER_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_CONTROLLER_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_CONTROLLER_H_
 #pragma once
 
 #include "base/string16.h"
@@ -43,4 +43,4 @@ class TextfieldController {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_CONTROLLER_H_
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_CONTROLLER_H_
diff --git a/views/controls/textfield/textfield_views_model.cc b/ui/views/controls/textfield/textfield_views_model.cc
index 7c5ee0b..0895f91 100644
--- a/views/controls/textfield/textfield_views_model.cc
+++ b/ui/views/controls/textfield/textfield_views_model.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/controls/textfield/textfield_views_model.h"
+#include "ui/views/controls/textfield/textfield_views_model.h"
 
 #include <algorithm>
 
@@ -16,7 +16,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/render_text.h"
-#include "views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "views/views_delegate.h"
 
 namespace views {
diff --git a/views/controls/textfield/textfield_views_model.h b/ui/views/controls/textfield/textfield_views_model.h
index 02d5db8..d13a7b6d 100644
--- a/views/controls/textfield/textfield_views_model.h
+++ b/ui/views/controls/textfield/textfield_views_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
-#define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
+#ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
+#define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
 #pragma once
 
 #include <list>
@@ -326,4 +326,4 @@ class VIEWS_EXPORT TextfieldViewsModel {
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
+#endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
diff --git a/views/controls/textfield/textfield_views_model_unittest.cc b/ui/views/controls/textfield/textfield_views_model_unittest.cc
index 991f595..1cf7d71 100644
--- a/views/controls/textfield/textfield_views_model_unittest.cc
+++ b/ui/views/controls/textfield/textfield_views_model_unittest.cc
@@ -13,10 +13,10 @@
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/controls/textfield/textfield_views_model.h"
 #include "views/views_delegate.h"
 
 namespace {
diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc
index d4ad38e..3a9a7d6 100644
--- a/ui/views/examples/textfield_example.cc
+++ b/ui/views/examples/textfield_example.cc
@@ -7,9 +7,9 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/textfield_example.h b/ui/views/examples/textfield_example.h
index f3e1d74..36d43cd 100644
--- a/ui/views/examples/textfield_example.h
+++ b/ui/views/examples/textfield_example.h
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/textfield/textfield_controller.h"
 
 namespace examples {
 
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index af4ea62..e17d8f1 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -5,12 +5,12 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/focus/focus_manager_test.h"
 #include "ui/views/widget/widget.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/textfield/textfield.h"
 
 #if !defined(USE_AURA)
 #include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index 5583291..02151d7 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -9,6 +9,7 @@
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/native/native_view_host.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager_test.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ -18,7 +19,6 @@
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/scroll_view.h"
-#include "views/controls/textfield/textfield.h"
 
 #if !defined(USE_AURA)
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
index 64c9ab1..23423b8 100644
--- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc
+++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
@@ -6,12 +6,12 @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/touchui/touch_selection_controller.h"
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/widget/widget.h"
-#include "views/controls/textfield/native_textfield_views.h"
-#include "views/controls/textfield/textfield.h"
 
 namespace views {
 
diff --git a/ui/views/widget/native_widget_gtk.cc b/ui/views/widget/native_widget_gtk.cc
index c744216..6192516 100644
--- a/ui/views/widget/native_widget_gtk.cc
+++ b/ui/views/widget/native_widget_gtk.cc
@@ -34,16 +34,16 @@
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/ime/input_method_gtk.h"
-#include "views/controls/textfield/native_textfield_views.h"
-#include "views/views_delegate.h"
 #include "ui/views/widget/drop_target_gtk.h"
 #include "ui/views/widget/gtk_views_fixed.h"
 #include "ui/views/widget/gtk_views_window.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/tooltip_manager_gtk.h"
 #include "ui/views/widget/widget_delegate.h"
+#include "views/views_delegate.h"
 
 #if defined(HAVE_IBUS)
 #include "ui/views/ime/input_method_ibus.h"
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index d49b5fe..8c07a86 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -33,6 +33,7 @@
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/accessibility/native_view_accessibility_win.h"
+#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/ime/input_method_win.h"
@@ -45,7 +46,6 @@
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/native_frame_view.h"
 #include "views/controls/native_control_win.h"
-#include "views/controls/textfield/native_textfield_views.h"
 #include "views/views_delegate.h"
 
 #pragma comment(lib, "dwmapi.lib")
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index 53fae80..b4c4e9d 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -11,6 +11,7 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/message_box_flags.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
@@ -18,7 +19,6 @@
 #include "views/controls/button/checkbox.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
-#include "views/controls/textfield/textfield.h"
 #include "views/views_delegate.h"
 
 const int kDefaultMessageWidth = 320;
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 235b515..0dd628d 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -22,6 +22,7 @@
 #include "ui/gfx/path.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/controls/native/native_view_host.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/events/event.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/view_storage.h"
@@ -34,7 +35,6 @@
 #include "views/controls/button/button_dropdown.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/scroll_view.h"
-#include "views/controls/textfield/textfield.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
 
diff --git a/views/views.gyp b/views/views.gyp
index 24e715f..ccadee0 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -151,22 +151,6 @@
         'controls/single_split_view.cc',
         'controls/single_split_view.h',
         'controls/single_split_view_listener.h',
-        'controls/textfield/gtk_views_entry.cc',
-        'controls/textfield/gtk_views_entry.h',
-        'controls/textfield/gtk_views_textview.cc',
-        'controls/textfield/gtk_views_textview.h',
-        'controls/textfield/textfield.cc',
-        'controls/textfield/textfield.h',
-        'controls/textfield/textfield_controller.h',
-        'controls/textfield/textfield_views_model.cc',
-        'controls/textfield/textfield_views_model.h',
-        'controls/textfield/native_textfield_gtk.cc',
-        'controls/textfield/native_textfield_gtk.h',
-        'controls/textfield/native_textfield_win.cc',
-        'controls/textfield/native_textfield_win.h',
-        'controls/textfield/native_textfield_wrapper.h',
-        'controls/textfield/native_textfield_views.cc',
-        'controls/textfield/native_textfield_views.h',
         'controls/throbber.cc',
         'controls/throbber.h',
         #'debug_utils.cc',
@@ -272,6 +256,22 @@
         '../ui/views/controls/table/table_view2.cc',
         '../ui/views/controls/table/table_view2.h',
         '../ui/views/controls/table/table_view_observer.h',
+        '../ui/views/controls/textfield/gtk_views_entry.cc',
+        '../ui/views/controls/textfield/gtk_views_entry.h',
+        '../ui/views/controls/textfield/gtk_views_textview.cc',
+        '../ui/views/controls/textfield/gtk_views_textview.h',
+        '../ui/views/controls/textfield/native_textfield_gtk.cc',
+        '../ui/views/controls/textfield/native_textfield_gtk.h',
+        '../ui/views/controls/textfield/native_textfield_views.cc',
+        '../ui/views/controls/textfield/native_textfield_views.h',
+        '../ui/views/controls/textfield/native_textfield_win.cc',
+        '../ui/views/controls/textfield/native_textfield_win.h',
+        '../ui/views/controls/textfield/native_textfield_wrapper.h',
+        '../ui/views/controls/textfield/textfield.cc',
+        '../ui/views/controls/textfield/textfield.h',
+        '../ui/views/controls/textfield/textfield_controller.h',
+        '../ui/views/controls/textfield/textfield_views_model.cc',
+        '../ui/views/controls/textfield/textfield_views_model.h',
         '../ui/views/controls/tree/tree_view.cc',
         '../ui/views/controls/tree/tree_view.h',
         '../ui/views/events/event.cc',
@@ -513,6 +513,8 @@
         '../ui/views/controls/scrollbar/scrollbar_unittest.cc',
         '../ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc',
         '../ui/views/controls/table/table_view_unittest.cc',
+        '../ui/views/controls/textfield/native_textfield_views_unittest.cc',
+        '../ui/views/controls/textfield/textfield_views_model_unittest.cc',
         '../ui/views/events/event_unittest.cc',
         '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
         '../ui/views/focus/focus_manager_test.h',
@@ -538,8 +540,6 @@
         'controls/progress_bar_unittest.cc',
         'controls/single_split_view_unittest.cc',
         'controls/menu/menu_model_adapter_unittest.cc',
-        'controls/textfield/native_textfield_views_unittest.cc',
-        'controls/textfield/textfield_views_model_unittest.cc',
         'run_all_unittests.cc',
         'view_unittest.cc',