| Index: content/shell/renderer/layout_test/layout_test_render_process_observer.cc
|
| diff --git a/content/shell/renderer/layout_test/layout_test_render_process_observer.cc b/content/shell/renderer/layout_test/layout_test_render_process_observer.cc
|
| index d62ae5838cfeeacd1d09904fc55085997255e65a..0ca0149030c5599be298ff931a92c185afadc2a6 100644
|
| --- a/content/shell/renderer/layout_test/layout_test_render_process_observer.cc
|
| +++ b/content/shell/renderer/layout_test/layout_test_render_process_observer.cc
|
| @@ -43,26 +43,7 @@ LayoutTestRenderProcessObserver::LayoutTestRenderProcessObserver()
|
| g_instance = this;
|
| RenderThread::Get()->AddObserver(this);
|
| EnableRendererLayoutTestMode();
|
| -}
|
| -
|
| -LayoutTestRenderProcessObserver::~LayoutTestRenderProcessObserver() {
|
| - CHECK(g_instance == this);
|
| - g_instance = NULL;
|
| -}
|
| -
|
| -void LayoutTestRenderProcessObserver::SetTestDelegate(
|
| - test_runner::WebTestDelegate* delegate) {
|
| - test_interfaces_->SetDelegate(delegate);
|
| - test_delegate_ = delegate;
|
| -}
|
| -
|
| -void LayoutTestRenderProcessObserver::SetMainWindow(RenderView* view) {
|
| - BlinkTestRunner* test_runner = BlinkTestRunner::Get(view);
|
| - test_interfaces_->SetWebView(view->GetWebView(), test_runner->proxy());
|
| - main_test_runner_ = test_runner;
|
| -}
|
|
|
| -void LayoutTestRenderProcessObserver::WebKitInitialized() {
|
| // We always expose GC to layout tests.
|
| std::string flags("--expose-gc");
|
| v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
|
| @@ -85,6 +66,23 @@ void LayoutTestRenderProcessObserver::WebKitInitialized() {
|
| }
|
| }
|
|
|
| +LayoutTestRenderProcessObserver::~LayoutTestRenderProcessObserver() {
|
| + CHECK(g_instance == this);
|
| + g_instance = NULL;
|
| +}
|
| +
|
| +void LayoutTestRenderProcessObserver::SetTestDelegate(
|
| + test_runner::WebTestDelegate* delegate) {
|
| + test_interfaces_->SetDelegate(delegate);
|
| + test_delegate_ = delegate;
|
| +}
|
| +
|
| +void LayoutTestRenderProcessObserver::SetMainWindow(RenderView* view) {
|
| + BlinkTestRunner* test_runner = BlinkTestRunner::Get(view);
|
| + test_interfaces_->SetWebView(view->GetWebView(), test_runner->proxy());
|
| + main_test_runner_ = test_runner;
|
| +}
|
| +
|
| void LayoutTestRenderProcessObserver::OnRenderProcessShutdown() {
|
| test_interfaces_.reset();
|
| }
|
|
|