content/shell/renderer/layout_test/layout_test_render_frame_observer.cc - Issue 2707183003: Move //components/test_runner back into //content/shell

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/shell/renderer/layout_test/layout_test_render_frame_observer.cc

Issue 2707183003: Move //components/test_runner back into //content/shell (Closed)

Patch Set: Trim DEPS Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« components/subresource_filter/DEPS ('K') | « content/shell/renderer/layout_test/layout_test_content_renderer_client.cc ('k') | content/shell/renderer/layout_test/layout_test_render_thread_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h "	5 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h "

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "components/test_runner/web_test_interfaces.h"

10 #include "components/test_runner/web_test_runner.h"

11 #include "content/public/common/associated_interface_registry.h"	9 #include "content/public/common/associated_interface_registry.h"

12 #include "content/public/renderer/render_frame.h"	10 #include "content/public/renderer/render_frame.h"

13 #include "content/shell/common/shell_messages.h"	11 #include "content/shell/common/shell_messages.h"

14 #include "content/shell/renderer/layout_test/blink_test_runner.h"	12 #include "content/shell/renderer/layout_test/blink_test_runner.h"

15 #include "content/shell/renderer/layout_test/layout_test_render_thread_observer. h"	13 #include "content/shell/renderer/layout_test/layout_test_render_thread_observer. h"

	14 #include "content/shell/test_runner/web_test_interfaces.h"

	15 #include "content/shell/test_runner/web_test_runner.h"

16 #include "ipc/ipc_message_macros.h"	16 #include "ipc/ipc_message_macros.h"

17 #include "third_party/WebKit/public/web/WebLocalFrame.h"	17 #include "third_party/WebKit/public/web/WebLocalFrame.h"

18	18

19 namespace content {	19 namespace content {

20	20

21 LayoutTestRenderFrameObserver::LayoutTestRenderFrameObserver(	21 LayoutTestRenderFrameObserver::LayoutTestRenderFrameObserver(

22 RenderFrame* render_frame)	22 RenderFrame* render_frame)

23 : RenderFrameObserver(render_frame), binding_(this) {	23 : RenderFrameObserver(render_frame), binding_(this) {

24 render_frame->GetWebFrame()->setContentSettingsClient(	24 render_frame->GetWebFrame()->setContentSettingsClient(

25 LayoutTestRenderThreadObserver::GetInstance()	25 LayoutTestRenderThreadObserver::GetInstance()

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 BlinkTestRunner::Get(render_frame()->GetRenderView())	61 BlinkTestRunner::Get(render_frame()->GetRenderView())

62 ->OnSetTestConfiguration(std::move(config));	62 ->OnSetTestConfiguration(std::move(config));

63 }	63 }

64	64

65 void LayoutTestRenderFrameObserver::SetupSecondaryRenderer() {	65 void LayoutTestRenderFrameObserver::SetupSecondaryRenderer() {

66 BlinkTestRunner::Get(render_frame()->GetRenderView())	66 BlinkTestRunner::Get(render_frame()->GetRenderView())

67 ->OnSetupSecondaryRenderer();	67 ->OnSetupSecondaryRenderer();

68 }	68 }

69	69

70 } // namespace content	70 } // namespace content

OLD	NEW