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