| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/test/render_view_test.h" | 5 #include "content/public/test/render_view_test.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cctype> | 9 #include <cctype> |
| 10 | 10 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 | 112 |
| 113 } // namespace | 113 } // namespace |
| 114 | 114 |
| 115 namespace content { | 115 namespace content { |
| 116 | 116 |
| 117 class RendererBlinkPlatformImplTestOverrideImpl | 117 class RendererBlinkPlatformImplTestOverrideImpl |
| 118 : public RendererBlinkPlatformImpl { | 118 : public RendererBlinkPlatformImpl { |
| 119 public: | 119 public: |
| 120 RendererBlinkPlatformImplTestOverrideImpl( | 120 RendererBlinkPlatformImplTestOverrideImpl( |
| 121 blink::scheduler::RendererScheduler* scheduler) | 121 blink::scheduler::RendererScheduler* scheduler) |
| 122 : RendererBlinkPlatformImpl(scheduler, nullptr) {} | 122 : RendererBlinkPlatformImpl(scheduler, nullptr, nullptr) {} |
| 123 | 123 |
| 124 // Get rid of the dependency to the sandbox, which is not available in | 124 // Get rid of the dependency to the sandbox, which is not available in |
| 125 // RenderViewTest. | 125 // RenderViewTest. |
| 126 blink::WebSandboxSupport* sandboxSupport() override { return NULL; } | 126 blink::WebSandboxSupport* sandboxSupport() override { return NULL; } |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 RenderViewTest::RendererBlinkPlatformImplTestOverride:: | 129 RenderViewTest::RendererBlinkPlatformImplTestOverride:: |
| 130 RendererBlinkPlatformImplTestOverride() { | 130 RendererBlinkPlatformImplTestOverride() { |
| 131 renderer_scheduler_ = blink::scheduler::RendererScheduler::Create(); | 131 renderer_scheduler_ = blink::scheduler::RendererScheduler::Create(); |
| 132 blink_platform_impl_.reset( | 132 blink_platform_impl_.reset( |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); | 666 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); |
| 667 frame->Navigate(common_params, StartNavigationParams(), request_params); | 667 frame->Navigate(common_params, StartNavigationParams(), request_params); |
| 668 | 668 |
| 669 // The load actually happens asynchronously, so we pump messages to process | 669 // The load actually happens asynchronously, so we pump messages to process |
| 670 // the pending continuation. | 670 // the pending continuation. |
| 671 FrameLoadWaiter(frame).Wait(); | 671 FrameLoadWaiter(frame).Wait(); |
| 672 view_->GetWebView()->updateAllLifecyclePhases(); | 672 view_->GetWebView()->updateAllLifecyclePhases(); |
| 673 } | 673 } |
| 674 | 674 |
| 675 } // namespace content | 675 } // namespace content |
| OLD | NEW |