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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 } | 247 } |
248 | 248 |
249 TestRenderViewHost::~TestRenderViewHost() { | 249 TestRenderViewHost::~TestRenderViewHost() { |
250 if (delete_counter_) | 250 if (delete_counter_) |
251 ++*delete_counter_; | 251 ++*delete_counter_; |
252 } | 252 } |
253 | 253 |
254 bool TestRenderViewHost::CreateRenderView( | 254 bool TestRenderViewHost::CreateRenderView( |
255 const base::string16& frame_name, | 255 const base::string16& frame_name, |
256 int opener_route_id, | 256 int opener_route_id, |
257 int32 max_page_id) { | 257 int32 max_page_id, |
| 258 bool window_was_created_with_opener) { |
258 DCHECK(!render_view_created_); | 259 DCHECK(!render_view_created_); |
259 render_view_created_ = true; | 260 render_view_created_ = true; |
260 opener_route_id_ = opener_route_id; | 261 opener_route_id_ = opener_route_id; |
261 return true; | 262 return true; |
262 } | 263 } |
263 | 264 |
264 bool TestRenderViewHost::IsRenderViewLive() const { | 265 bool TestRenderViewHost::IsRenderViewLive() const { |
265 return render_view_created_; | 266 return render_view_created_; |
266 } | 267 } |
267 | 268 |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 | 401 |
401 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { | 402 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { |
402 return static_cast<TestRenderFrameHost*>(main_rfh()); | 403 return static_cast<TestRenderFrameHost*>(main_rfh()); |
403 } | 404 } |
404 | 405 |
405 TestWebContents* RenderViewHostImplTestHarness::contents() { | 406 TestWebContents* RenderViewHostImplTestHarness::contents() { |
406 return static_cast<TestWebContents*>(web_contents()); | 407 return static_cast<TestWebContents*>(web_contents()); |
407 } | 408 } |
408 | 409 |
409 } // namespace content | 410 } // namespace content |
OLD | NEW |