OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #ifndef CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ | 5 #ifndef CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ |
6 #define CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ | 6 #define CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 } | 166 } |
167 | 167 |
168 virtual void set_render_process_host_factory( | 168 virtual void set_render_process_host_factory( |
169 RenderProcessHostFactory* rph_factory) { | 169 RenderProcessHostFactory* rph_factory) { |
170 render_process_host_factory_ = rph_factory; | 170 render_process_host_factory_ = rph_factory; |
171 } | 171 } |
172 | 172 |
173 virtual RenderViewHost* CreateRenderViewHost( | 173 virtual RenderViewHost* CreateRenderViewHost( |
174 SiteInstance* instance, | 174 SiteInstance* instance, |
175 RenderViewHostDelegate* delegate, | 175 RenderViewHostDelegate* delegate, |
176 int routing_id) { | 176 int routing_id, |
| 177 int64 session_storage_namespace_id) { |
177 // See declaration of render_process_host_factory_ below. | 178 // See declaration of render_process_host_factory_ below. |
178 instance->set_render_process_host_factory(render_process_host_factory_); | 179 instance->set_render_process_host_factory(render_process_host_factory_); |
179 return new TestRenderViewHost(instance, delegate, routing_id); | 180 return new TestRenderViewHost(instance, delegate, routing_id); |
180 } | 181 } |
181 | 182 |
182 private: | 183 private: |
183 // This is a bit of a hack. With the current design of the site instances / | 184 // This is a bit of a hack. With the current design of the site instances / |
184 // browsing instances, it's difficult to pass a RenderProcessHostFactory | 185 // browsing instances, it's difficult to pass a RenderProcessHostFactory |
185 // around properly. | 186 // around properly. |
186 // | 187 // |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 TestRenderViewHostFactory rvh_factory_; | 258 TestRenderViewHostFactory rvh_factory_; |
258 | 259 |
259 scoped_ptr<TestTabContents> contents_; | 260 scoped_ptr<TestTabContents> contents_; |
260 | 261 |
261 scoped_ptr<UserDataManager> user_data_manager_; | 262 scoped_ptr<UserDataManager> user_data_manager_; |
262 | 263 |
263 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); | 264 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); |
264 }; | 265 }; |
265 | 266 |
266 #endif // CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ | 267 #endif // CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ |
OLD | NEW |