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

Side by Side Diff: content/test/test_render_view_host.cc

Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@channel_creation_preempt
Patch Set: fix more tests Created 5 years, 3 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
« no previous file with comments | « content/test/test_render_view_host.h ('k') | content/test/test_render_view_host_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/test/test_render_view_host.h" 5 #include "content/test/test_render_view_host.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" 9 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
10 #include "content/browser/dom_storage/session_storage_namespace_impl.h" 10 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 const { 208 const {
209 return 0; 209 return 0;
210 } 210 }
211 #endif 211 #endif
212 212
213 TestRenderViewHost::TestRenderViewHost( 213 TestRenderViewHost::TestRenderViewHost(
214 SiteInstance* instance, 214 SiteInstance* instance,
215 RenderViewHostDelegate* delegate, 215 RenderViewHostDelegate* delegate,
216 RenderWidgetHostDelegate* widget_delegate, 216 RenderWidgetHostDelegate* widget_delegate,
217 int32 routing_id, 217 int32 routing_id,
218 int32 surface_id,
219 int32 main_frame_routing_id, 218 int32 main_frame_routing_id,
220 bool swapped_out) 219 bool swapped_out)
221 : RenderViewHostImpl(instance, 220 : RenderViewHostImpl(instance,
222 delegate, 221 delegate,
223 widget_delegate, 222 widget_delegate,
224 routing_id, 223 routing_id,
225 surface_id,
226 main_frame_routing_id, 224 main_frame_routing_id,
227 swapped_out, 225 swapped_out,
228 false /* hidden */, 226 false /* hidden */,
229 false /* has_initialized_audio_host */), 227 false /* has_initialized_audio_host */),
230 delete_counter_(NULL), 228 delete_counter_(NULL),
231 opener_frame_route_id_(MSG_ROUTING_NONE) { 229 opener_frame_route_id_(MSG_ROUTING_NONE) {
232 // TestRenderWidgetHostView installs itself into this->view_ in its 230 // TestRenderWidgetHostView installs itself into this->view_ in its
233 // constructor, and deletes itself when TestRenderWidgetHostView::Destroy() is 231 // constructor, and deletes itself when TestRenderWidgetHostView::Destroy() is
234 // called. 232 // called.
235 new TestRenderWidgetHostView(this); 233 new TestRenderWidgetHostView(this);
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 331
334 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { 332 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
335 return contents()->GetMainFrame(); 333 return contents()->GetMainFrame();
336 } 334 }
337 335
338 TestWebContents* RenderViewHostImplTestHarness::contents() { 336 TestWebContents* RenderViewHostImplTestHarness::contents() {
339 return static_cast<TestWebContents*>(web_contents()); 337 return static_cast<TestWebContents*>(web_contents());
340 } 338 }
341 339
342 } // namespace content 340 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_render_view_host.h ('k') | content/test/test_render_view_host_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698