summaryrefslogtreecommitdiffstats
path: root/content/shell/shell_browser_main.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 10:47:45 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 10:47:45 +0000
commit9b4c6cd5c347f11281bad8ade95fa5312616af6c (patch)
tree8dd1f1f4c65bac1abdf4921888fa7316bd875185 /content/shell/shell_browser_main.cc
parent0fc4e6ef082e6b6053a3f77932335bcbe59b258a (diff)
downloadchromium_src-9b4c6cd5c347f11281bad8ade95fa5312616af6c.zip
chromium_src-9b4c6cd5c347f11281bad8ade95fa5312616af6c.tar.gz
chromium_src-9b4c6cd5c347f11281bad8ade95fa5312616af6c.tar.bz2
[content shell] rename layout_test_controller{,_host,_bindings}.* to webkit_test_runner
BUG=111316 TEST=none TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10860037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_browser_main.cc')
-rw-r--r--content/shell/shell_browser_main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc
index 8628d95..386ccf6 100644
--- a/content/shell/shell_browser_main.cc
+++ b/content/shell/shell_browser_main.cc
@@ -9,11 +9,11 @@
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_restrictions.h"
#include "content/public/browser/browser_main_runner.h"
-#include "content/shell/layout_test_controller_host.h"
#include "content/shell/shell.h"
#include "content/shell/shell_browser_context.h"
#include "content/shell/shell_content_browser_client.h"
#include "content/shell/shell_switches.h"
+#include "content/shell/webkit_test_runner_host.h"
#include "webkit/support/webkit_support.h"
namespace {
@@ -86,7 +86,7 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) {
NULL,
MSG_ROUTING_NONE,
NULL);
- content::LayoutTestControllerHost::Init(pixel_hash);
+ content::WebKitTestRunnerHost::Init(pixel_hash);
main_runner_->Run();