Roll up patch for running layout tests under Aura.

Source/testing/runner/TestInterfaces.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 #ifndef TestInterfaces_h
 #define TestInterfaces_h
 
 #include "public/platform/WebNonCopyable.h"
 
 #include <memory>
 #include <vector>
 
-#if defined(WIN32)
+#if defined(USE_DEFAULT_RENDER_THEME)
+#include "WebTestThemeEngineMock.h"
+#elif defined(WIN32)
 #include "WebTestThemeEngineWin.h"
 #elif defined(__APPLE__)
 #include "WebTestThemeEngineMac.h"
 #endif
 
 namespace blink {
 class WebFrame;
 class WebThemeEngine;
 class WebURL;
 class WebView;
@@ skipping 36 matching lines @@
 private:
     std::auto_ptr<AccessibilityController> m_accessibilityController;
     std::auto_ptr<EventSender> m_eventSender;
     std::auto_ptr<GamepadController> m_gamepadController;
     std::auto_ptr<TextInputController> m_textInputController;
     std::auto_ptr<TestRunner> m_testRunner;
     WebTestDelegate* m_delegate;
     WebTestProxyBase* m_proxy;
 
     std::vector<WebTestProxyBase*> m_windowList;
-#if !defined(USE_DEFAULT_RENDER_THEME)
-#if defined(WIN32)
+#if defined(USE_DEFAULT_RENDER_THEME)
+    std::auto_ptr<WebTestThemeEngineMock> m_themeEngine;
+#elif defined(WIN32)
     std::auto_ptr<WebTestThemeEngineWin> m_themeEngine;
 #elif defined(__APPLE__)
     std::auto_ptr<WebTestThemeEngineMac> m_themeEngine;
 #endif
-#endif
 };
 
 }
 
 #endif // TestInterfaces_h