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

webkit/tools/test_shell/test_shell_platform_delegate_win.cc

Index: webkit/tools/test_shell/test_shell_platform_delegate_win.cc
===================================================================
--- webkit/tools/test_shell/test_shell_platform_delegate_win.cc	(revision 137002)
+++ webkit/tools/test_shell/test_shell_platform_delegate_win.cc	(working copy)
@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
+#include <list>
 #include <windows.h>
 #include <commctrl.h>
 
-#include <list>
-#include <string>
-
 #include "base/command_line.h"
 #include "base/event_recorder.h"
 #include "base/win/win_util.h"
-#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/base/win/foreground_helper.h"
+#include "ui/gfx/native_theme_win.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"
 
@@ -141,7 +140,7 @@
 }
 
 void TestShellPlatformDelegate::SelectUnifiedTheme() {
-  ui::NativeThemeWin::instance()->DisableTheming();
+  gfx::NativeThemeWin::instance()->DisableTheming();
 }
 
 void TestShellPlatformDelegate::SetWindowPositionForRecording(