Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / shell / renderer / test_runner / TestInterfaces.h

diff --git a/src/content/shell/renderer/test_runner/TestInterfaces.h b/src/content/shell/renderer/test_runner/TestInterfaces.h
index b22410e..69e490c 100644 (file)
--- a/src/content/shell/renderer/test_runner/TestInterfaces.h
+++ b/src/content/shell/renderer/test_runner/TestInterfaces.h
@@ -11,12 +11,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/public/platform/WebNonCopyable.h"
 
-#if defined(USE_DEFAULT_RENDER_THEME)
-#include "content/shell/renderer/test_runner/WebTestThemeEngineMock.h"
-#elif defined(WIN32)
-#include "content/shell/renderer/test_runner/WebTestThemeEngineWin.h"
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
 #include "content/shell/renderer/test_runner/WebTestThemeEngineMac.h"
+#else
+#include "content/shell/renderer/test_runner/WebTestThemeEngineMock.h"
 #endif
 
 namespace blink {
@@ -26,13 +24,16 @@ class WebURL;
 class WebView;
 }
 
+namespace content {
+class GamepadController;
+class TextInputController;
+}
+
 namespace WebTestRunner {
 
 class AccessibilityController;
 class EventSender;
-class GamepadController;
 class TestRunner;
-class TextInputController;
 class WebTestDelegate;
 class WebTestProxyBase;
 
@@ -63,19 +64,17 @@ public:
 private:
     scoped_ptr<AccessibilityController> m_accessibilityController;
     scoped_ptr<EventSender> m_eventSender;
-    scoped_ptr<GamepadController> m_gamepadController;
-    scoped_ptr<TextInputController> m_textInputController;
+    scoped_ptr<content::GamepadController> m_gamepadController;
+    scoped_ptr<content::TextInputController> m_textInputController;
     scoped_ptr<TestRunner> m_testRunner;
     WebTestDelegate* m_delegate;
     WebTestProxyBase* m_proxy;
 
     std::vector<WebTestProxyBase*> m_windowList;
-#if defined(USE_DEFAULT_RENDER_THEME)
-    scoped_ptr<WebTestThemeEngineMock> m_themeEngine;
-#elif defined(WIN32)
-    scoped_ptr<WebTestThemeEngineWin> m_themeEngine;
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
     scoped_ptr<WebTestThemeEngineMac> m_themeEngine;
+#else
+    scoped_ptr<WebTestThemeEngineMock> m_themeEngine;
 #endif
 
     DISALLOW_COPY_AND_ASSIGN(TestInterfaces);