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

ui/views/controls/menu/menu_separator_win.cc

Index: ui/views/controls/menu/menu_separator_win.cc
===================================================================
--- ui/views/controls/menu/menu_separator_win.cc	(revision 137002)
+++ ui/views/controls/menu/menu_separator_win.cc	(working copy)
@@ -8,8 +8,8 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "ui/base/native_theme/native_theme.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/native_theme.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_item_view.h"
@@ -20,24 +20,24 @@
   const MenuConfig& config = MenuConfig::instance();
   // The gutter is rendered before the background.
   int start_x = 0;
-  const ui::NativeTheme* theme = ui::NativeTheme::instance();
+  const gfx::NativeTheme* theme = gfx::NativeTheme::instance();
   if (config.render_gutter) {
     // If render_gutter is true, we're on Vista and need to render the
     // gutter, then indent the separator from the gutter.
     gfx::Rect gutter_bounds(MenuItemView::label_start() -
         config.gutter_to_label - config.gutter_width, 0,
         config.gutter_width, height());
-    ui::NativeTheme::ExtraParams extra;
-    theme->Paint(canvas->sk_canvas(), ui::NativeTheme::kMenuPopupGutter,
-                 ui::NativeTheme::kNormal, gutter_bounds, extra);
+    gfx::NativeTheme::ExtraParams extra;
+    theme->Paint(canvas->sk_canvas(), gfx::NativeTheme::kMenuPopupGutter,
+                 gfx::NativeTheme::kNormal, gutter_bounds, extra);
     start_x = gutter_bounds.x() + config.gutter_width;
   }
 
   gfx::Rect separator_bounds(start_x, 0, width(), height());
-  ui::NativeTheme::ExtraParams extra;
+  gfx::NativeTheme::ExtraParams extra;
   extra.menu_separator.has_gutter = config.render_gutter;
-  theme->Paint(canvas->sk_canvas(), ui::NativeTheme::kMenuPopupSeparator,
-               ui::NativeTheme::kNormal, separator_bounds, extra);
+  theme->Paint(canvas->sk_canvas(), gfx::NativeTheme::kMenuPopupSeparator,
+               gfx::NativeTheme::kNormal, separator_bounds, extra);
 }
 
 gfx::Size MenuSeparator::GetPreferredSize() {