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

webkit/tools/test_shell/test_shell_platform_delegate_win.cc

 // 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.
 
+#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"
 
 TestShellPlatformDelegate::TestShellPlatformDelegate(
     const CommandLine& command_line)
     : command_line_(command_line) {
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
   _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
 #endif
@@ skipping 108 matching lines @@
 void TestShellPlatformDelegate::InitializeGUI() {
   INITCOMMONCONTROLSEX InitCtrlEx;
 
   InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX);
   InitCtrlEx.dwICC  = ICC_STANDARD_CLASSES;
   InitCommonControlsEx(&InitCtrlEx);
   TestShell::RegisterWindowClass();
 }
 
 void TestShellPlatformDelegate::SelectUnifiedTheme() {
-  ui::NativeThemeWin::instance()->DisableTheming();
+  gfx::NativeThemeWin::instance()->DisableTheming();
 }
 
 void TestShellPlatformDelegate::SetWindowPositionForRecording(
     TestShell *shell) {
   // Move the window to the upper left corner for consistent
   // record/playback mode.  For automation, we want this to work
   // on build systems where the script invoking us is a background
   // process.  So for this case, make our window the topmost window
   // as well.
   CHECK(ui::ForegroundHelper::SetForeground(shell->mainWnd()) == S_OK);
   ::SetWindowPos(shell->mainWnd(), HWND_TOP, 0, 0, 600, 800, 0);
 }