Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: content/test/test_render_view_host.h

Issue 1142123002: Remove swapped-out usage in --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another round of fixes. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/test/test_render_frame_host.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 5 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 21 matching lines...) Expand all
32 32
33 namespace gfx { 33 namespace gfx {
34 class Rect; 34 class Rect;
35 } 35 }
36 36
37 namespace content { 37 namespace content {
38 38
39 class SiteInstance; 39 class SiteInstance;
40 class TestRenderFrameHost; 40 class TestRenderFrameHost;
41 class TestWebContents; 41 class TestWebContents;
42 struct FrameReplicationState;
42 43
43 // Utility function to initialize FrameHostMsg_DidCommitProvisionalLoad_Params 44 // Utility function to initialize FrameHostMsg_DidCommitProvisionalLoad_Params
44 // with given parameters. 45 // with given parameters.
45 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, 46 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
46 int page_id, 47 int page_id,
47 int nav_entry_id, 48 int nav_entry_id,
48 bool did_create_new_entry, 49 bool did_create_new_entry,
49 const GURL& url, 50 const GURL& url,
50 ui::PageTransition transition_type); 51 ui::PageTransition transition_type);
51 52
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 void set_delete_counter(int* delete_counter) { 226 void set_delete_counter(int* delete_counter) {
226 delete_counter_ = delete_counter; 227 delete_counter_ = delete_counter;
227 } 228 }
228 229
229 // The opener route id passed to CreateRenderView(). 230 // The opener route id passed to CreateRenderView().
230 int opener_route_id() const { return opener_route_id_; } 231 int opener_route_id() const { return opener_route_id_; }
231 232
232 // RenderWidgetHost overrides (same value, but in the Mock* type) 233 // RenderWidgetHost overrides (same value, but in the Mock* type)
233 MockRenderProcessHost* GetProcess() const override; 234 MockRenderProcessHost* GetProcess() const override;
234 235
236 bool CreateTestRenderView(const base::string16& frame_name,
237 int opener_route_id,
238 int proxy_route_id,
239 int32 max_page_id,
240 bool window_was_created_with_opener) override;
241
235 // RenderViewHost overrides -------------------------------------------------- 242 // RenderViewHost overrides --------------------------------------------------
236 243
237 bool CreateRenderView(const base::string16& frame_name, 244 bool CreateRenderView(const base::string16& frame_name,
238 int opener_route_id, 245 int opener_route_id,
239 int proxy_route_id, 246 int proxy_route_id,
240 int32 max_page_id, 247 int32 max_page_id,
248 const FrameReplicationState& replicated_frame_state,
241 bool window_was_created_with_opener) override; 249 bool window_was_created_with_opener) override;
242 bool IsFullscreenGranted() const override; 250 bool IsFullscreenGranted() const override;
243 251
244 private: 252 private:
245 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); 253 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);
246 254
247 void SendNavigateWithTransitionAndResponseCode(int page_id, 255 void SendNavigateWithTransitionAndResponseCode(int page_id,
248 const GURL& url, 256 const GURL& url,
249 ui::PageTransition transition, 257 ui::PageTransition transition,
250 int response_code); 258 int response_code);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 private: 323 private:
316 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> 324 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
317 ScopedSetSupportedScaleFactors; 325 ScopedSetSupportedScaleFactors;
318 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; 326 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
319 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 327 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
320 }; 328 };
321 329
322 } // namespace content 330 } // namespace content
323 331
324 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 332 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW
« no previous file with comments | « content/test/test_render_frame_host.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698