Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory.

ui/views/controls/combobox/native_combobox_win.cc

Index: ui/views/controls/combobox/native_combobox_win.cc
===================================================================
--- ui/views/controls/combobox/native_combobox_win.cc	(revision 137002)
+++ ui/views/controls/combobox/native_combobox_win.cc	(working copy)
@@ -7,10 +7,10 @@
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
-#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/native_theme_win.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/native_combobox_views.h"
 #include "ui/views/widget/widget.h"
@@ -109,8 +109,8 @@
   GetComboBoxInfo(native_view(), &cbi);
   gfx::Rect rect_item(cbi.rcItem);
   gfx::Rect rect_button(cbi.rcButton);
-  gfx::Size border = ui::NativeThemeWin::instance()->GetThemeBorderSize(
-      ui::NativeThemeWin::MENULIST);
+  gfx::Size border = gfx::NativeThemeWin::instance()->GetThemeBorderSize(
+      gfx::NativeThemeWin::MENULIST);
 
   // The padding value of '3' is the xy offset from the corner of the control
   // to the corner of rcItem.  It does not seem to be queryable from the theme.