[content shell] use the TestRunner library's theme engine for layout tests

content/shell/shell_content_renderer_client.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 "content/shell/shell_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "content/public/common/content_constants.h"
@@ skipping 139 matching lines @@
     return NULL;
   if (!hyphenator_)
     hyphenator_.reset(new webkit_glue::MockWebHyphenator);
   return hyphenator_.get();
 
 }
 
 WebThemeEngine* ShellContentRendererClient::OverrideThemeEngine() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     return NULL;
-  // TODO(jochen): return the TestRunner library's theme engine once WebKit has
-  // rolled.
-  return NULL;
+  return ShellRenderProcessObserver::GetInstance()->test_interfaces()
+      ->themeEngine();
 }
 
 void ShellContentRendererClient::WebTestProxyCreated(RenderView* render_view,
                                                      WebTestProxyBase* proxy) {
   WebKitTestRunner* test_runner = new WebKitTestRunner(render_view);
   test_runner->set_proxy(proxy);
   if (!ShellRenderProcessObserver::GetInstance()->test_delegate())
     ShellRenderProcessObserver::GetInstance()->SetTestDelegate(test_runner);
   proxy->setInterfaces(
       ShellRenderProcessObserver::GetInstance()->test_interfaces());
   test_runner->proxy()->setDelegate(
       ShellRenderProcessObserver::GetInstance()->test_delegate());
 }
 
 bool ShellContentRendererClient::AllowBrowserPlugin(
     WebKit::WebPluginContainer* container) const {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserPluginForAllViewTypes)) {
     // Allow BrowserPlugin if forced by command line flag. This is generally
     // true for tests.
     return true;
   }
   return ContentRendererClient::AllowBrowserPlugin(container);
 }
 
 }  // namespace content