Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: content/public/test/render_view_test.cc

Issue 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
OLDNEW
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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 165
166 private: 166 private:
167 std::unique_ptr<WebURLLoader> wrapped_loader_; 167 std::unique_ptr<WebURLLoader> wrapped_loader_;
168 }; 168 };
169 169
170 class RendererBlinkPlatformImplTestOverrideImpl 170 class RendererBlinkPlatformImplTestOverrideImpl
171 : public RendererBlinkPlatformImpl { 171 : public RendererBlinkPlatformImpl {
172 public: 172 public:
173 RendererBlinkPlatformImplTestOverrideImpl( 173 RendererBlinkPlatformImplTestOverrideImpl(
174 scheduler::RendererScheduler* scheduler) 174 scheduler::RendererScheduler* scheduler)
175 : RendererBlinkPlatformImpl(scheduler) {} 175 : RendererBlinkPlatformImpl(scheduler, nullptr) {
176 }
176 177
177 // Get rid of the dependency to the sandbox, which is not available in 178 // Get rid of the dependency to the sandbox, which is not available in
178 // RenderViewTest. 179 // RenderViewTest.
179 blink::WebSandboxSupport* sandboxSupport() override { return NULL; } 180 blink::WebSandboxSupport* sandboxSupport() override { return NULL; }
180 181
181 // Inject a WebURLLoader which rewrites requests that have the 182 // Inject a WebURLLoader which rewrites requests that have the
182 // X-WrappedHTMLData header. 183 // X-WrappedHTMLData header.
183 WebURLLoader* createURLLoader() override { 184 WebURLLoader* createURLLoader() override {
184 return new WebURLLoaderWrapper( 185 return new WebURLLoaderWrapper(
185 RendererBlinkPlatformImpl::createURLLoader()); 186 RendererBlinkPlatformImpl::createURLLoader());
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); 722 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame());
722 frame->Navigate(common_params, StartNavigationParams(), request_params); 723 frame->Navigate(common_params, StartNavigationParams(), request_params);
723 724
724 // The load actually happens asynchronously, so we pump messages to process 725 // The load actually happens asynchronously, so we pump messages to process
725 // the pending continuation. 726 // the pending continuation.
726 FrameLoadWaiter(frame).Wait(); 727 FrameLoadWaiter(frame).Wait();
727 view_->GetWebView()->updateAllLifecyclePhases(); 728 view_->GetWebView()->updateAllLifecyclePhases();
728 } 729 }
729 730
730 } // namespace content 731 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698