| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/renderer_host/test/test_render_view_host.h" | 5 #include "chrome/browser/renderer_host/test/test_render_view_host.h" |
| 6 | 6 |
| 7 #include "base/gfx/rect.h" | 7 #include "base/gfx/rect.h" |
| 8 #include "chrome/browser/renderer_host/test/test_backing_store.h" | 8 #include "chrome/browser/renderer_host/test/test_backing_store.h" |
| 9 #include "chrome/browser/tab_contents/test_tab_contents.h" | 9 #include "chrome/browser/tab_contents/test_tab_contents.h" |
| 10 #include "chrome/common/dom_storage_common.h" |
| 10 #include "chrome/common/render_messages.h" | 11 #include "chrome/common/render_messages.h" |
| 11 | 12 |
| 12 using webkit_glue::PasswordForm; | 13 using webkit_glue::PasswordForm; |
| 13 | 14 |
| 14 TestRenderViewHost::TestRenderViewHost(SiteInstance* instance, | 15 TestRenderViewHost::TestRenderViewHost(SiteInstance* instance, |
| 15 RenderViewHostDelegate* delegate, | 16 RenderViewHostDelegate* delegate, |
| 16 int routing_id) | 17 int routing_id) |
| 17 : RenderViewHost(instance, delegate, routing_id), | 18 : RenderViewHost(instance, delegate, routing_id, |
| 19 kInvalidSessionStorageNamespaceId), |
| 18 render_view_created_(false), | 20 render_view_created_(false), |
| 19 delete_counter_(NULL) { | 21 delete_counter_(NULL) { |
| 20 set_view(new TestRenderWidgetHostView(this)); | 22 set_view(new TestRenderWidgetHostView(this)); |
| 21 } | 23 } |
| 22 | 24 |
| 23 TestRenderViewHost::~TestRenderViewHost() { | 25 TestRenderViewHost::~TestRenderViewHost() { |
| 24 if (delete_counter_) | 26 if (delete_counter_) |
| 25 ++*delete_counter_; | 27 ++*delete_counter_; |
| 26 | 28 |
| 27 // Since this isn't a traditional view, we have to delete it. | 29 // Since this isn't a traditional view, we have to delete it. |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 user_data_manager_.reset(UserDataManager::Create()); | 111 user_data_manager_.reset(UserDataManager::Create()); |
| 110 } | 112 } |
| 111 | 113 |
| 112 void RenderViewHostTestHarness::TearDown() { | 114 void RenderViewHostTestHarness::TearDown() { |
| 113 contents_.reset(); | 115 contents_.reset(); |
| 114 | 116 |
| 115 // Make sure that we flush any messages related to TabContents destruction | 117 // Make sure that we flush any messages related to TabContents destruction |
| 116 // before we destroy the profile. | 118 // before we destroy the profile. |
| 117 MessageLoop::current()->RunAllPending(); | 119 MessageLoop::current()->RunAllPending(); |
| 118 } | 120 } |
| OLD | NEW |