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

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: Readd back overriden version of CreateRenderView in TestRenderViewHost. Fixes CleanUpSwappedOutRVHO… 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
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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 void set_delete_counter(int* delete_counter) { 225 void set_delete_counter(int* delete_counter) {
226 delete_counter_ = delete_counter; 226 delete_counter_ = delete_counter;
227 } 227 }
228 228
229 // The opener route id passed to CreateRenderView(). 229 // The opener route id passed to CreateRenderView().
230 int opener_route_id() const { return opener_route_id_; } 230 int opener_route_id() const { return opener_route_id_; }
231 231
232 // RenderWidgetHost overrides (same value, but in the Mock* type) 232 // RenderWidgetHost overrides (same value, but in the Mock* type)
233 MockRenderProcessHost* GetProcess() const override; 233 MockRenderProcessHost* GetProcess() const override;
234 234
235 bool CreateTestRenderView(const base::string16& frame_name,
236 int opener_route_id,
237 int proxy_route_id,
238 int32 max_page_id,
239 bool window_was_created_with_opener) override;
240
235 // RenderViewHost overrides -------------------------------------------------- 241 // RenderViewHost overrides --------------------------------------------------
236 242
237 bool CreateRenderView(const base::string16& frame_name, 243 bool CreateRenderView(const base::string16& frame_name,
238 int opener_route_id, 244 int opener_route_id,
239 int proxy_route_id, 245 int proxy_route_id,
240 int32 max_page_id, 246 int32 max_page_id,
247 const FrameReplicationState& replicated_frame_state,
Charlie Reis 2015/06/04 22:27:31 I think we're supposed to declare this class at th
nasko 2015/06/04 23:38:36 It is likely trickling in through another include,
241 bool window_was_created_with_opener) override; 248 bool window_was_created_with_opener) override;
242 bool IsFullscreenGranted() const override; 249 bool IsFullscreenGranted() const override;
243 250
244 private: 251 private:
245 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); 252 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);
246 253
247 void SendNavigateWithTransitionAndResponseCode(int page_id, 254 void SendNavigateWithTransitionAndResponseCode(int page_id,
248 const GURL& url, 255 const GURL& url,
249 ui::PageTransition transition, 256 ui::PageTransition transition,
250 int response_code); 257 int response_code);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 private: 322 private:
316 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> 323 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
317 ScopedSetSupportedScaleFactors; 324 ScopedSetSupportedScaleFactors;
318 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; 325 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
319 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 326 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
320 }; 327 };
321 328
322 } // namespace content 329 } // namespace content
323 330
324 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 331 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698