| Index: chrome/browser/dom_ui/web_ui_handler_browsertest.cc
|
| diff --git a/chrome/browser/dom_ui/dom_ui_handler_browsertest.cc b/chrome/browser/dom_ui/web_ui_handler_browsertest.cc
|
| similarity index 62%
|
| rename from chrome/browser/dom_ui/dom_ui_handler_browsertest.cc
|
| rename to chrome/browser/dom_ui/web_ui_handler_browsertest.cc
|
| index 0405fce70347b26f156faf70d08e22ebb688e946..126cad92997420722667fd36002955056b874056 100644
|
| --- a/chrome/browser/dom_ui/dom_ui_handler_browsertest.cc
|
| +++ b/chrome/browser/dom_ui/web_ui_handler_browsertest.cc
|
| @@ -2,38 +2,38 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/dom_ui/dom_ui_handler_browsertest.h"
|
| +#include "chrome/browser/dom_ui/web_ui_handler_browsertest.h"
|
|
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/renderer_host/render_view_host.h"
|
| #include "chrome/test/ui_test_utils.h"
|
|
|
| -bool DOMUITestHandler::Execute(const std::string& js_test) {
|
| +bool WebUIHandlerBrowserTest::Execute(const std::string& js_test) {
|
| dom_ui_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
|
| string16(), UTF8ToUTF16(js_test));
|
| return WaitForResult();
|
| }
|
|
|
| -void DOMUITestHandler::HandlePass(const ListValue* args) {
|
| +void WebUIHandlerBrowserTest::HandlePass(const ListValue* args) {
|
| test_succeeded_ = true;
|
| if (is_waiting_)
|
| MessageLoopForUI::current()->Quit();
|
| }
|
|
|
| -void DOMUITestHandler::HandleFail(const ListValue* args) {
|
| +void WebUIHandlerBrowserTest::HandleFail(const ListValue* args) {
|
| test_succeeded_ = false;
|
| if (is_waiting_)
|
| MessageLoopForUI::current()->Quit();
|
| }
|
|
|
| -void DOMUITestHandler::RegisterMessages() {
|
| +void WebUIHandlerBrowserTest::RegisterMessages() {
|
| dom_ui_->RegisterMessageCallback("Pass",
|
| - NewCallback(this, &DOMUITestHandler::HandlePass));
|
| + NewCallback(this, &WebUIHandlerBrowserTest::HandlePass));
|
| dom_ui_->RegisterMessageCallback("Fail",
|
| - NewCallback(this, &DOMUITestHandler::HandleFail));
|
| + NewCallback(this, &WebUIHandlerBrowserTest::HandleFail));
|
| }
|
|
|
| -bool DOMUITestHandler::WaitForResult() {
|
| +bool WebUIHandlerBrowserTest::WaitForResult() {
|
| is_waiting_ = true;
|
| ui_test_utils::RunMessageLoop();
|
| is_waiting_ = false;
|
|
|