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/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 "content/browser/dom_storage/dom_storage_context_wrapper.h" | 8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
10 #include "content/browser/site_instance_impl.h" | 10 #include "content/browser/site_instance_impl.h" |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 } | 232 } |
233 | 233 |
234 TestRenderViewHost::~TestRenderViewHost() { | 234 TestRenderViewHost::~TestRenderViewHost() { |
235 if (delete_counter_) | 235 if (delete_counter_) |
236 ++*delete_counter_; | 236 ++*delete_counter_; |
237 } | 237 } |
238 | 238 |
239 bool TestRenderViewHost::CreateRenderView( | 239 bool TestRenderViewHost::CreateRenderView( |
240 const base::string16& frame_name, | 240 const base::string16& frame_name, |
241 int opener_route_id, | 241 int opener_route_id, |
| 242 int proxy_route_id, |
242 int32 max_page_id, | 243 int32 max_page_id, |
243 bool window_was_created_with_opener) { | 244 bool window_was_created_with_opener) { |
244 DCHECK(!render_view_created_); | 245 DCHECK(!render_view_created_); |
245 render_view_created_ = true; | 246 render_view_created_ = true; |
246 opener_route_id_ = opener_route_id; | 247 opener_route_id_ = opener_route_id; |
247 return true; | 248 return true; |
248 } | 249 } |
249 | 250 |
250 bool TestRenderViewHost::IsRenderViewLive() const { | 251 bool TestRenderViewHost::IsRenderViewLive() const { |
251 return render_view_created_; | 252 return render_view_created_; |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 | 387 |
387 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { | 388 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { |
388 return static_cast<TestRenderFrameHost*>(main_rfh()); | 389 return static_cast<TestRenderFrameHost*>(main_rfh()); |
389 } | 390 } |
390 | 391 |
391 TestWebContents* RenderViewHostImplTestHarness::contents() { | 392 TestWebContents* RenderViewHostImplTestHarness::contents() { |
392 return static_cast<TestWebContents*>(web_contents()); | 393 return static_cast<TestWebContents*>(web_contents()); |
393 } | 394 } |
394 | 395 |
395 } // namespace content | 396 } // namespace content |
OLD | NEW |