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

Side by Side Diff: content/public/test/render_view_test.cc

Issue 1110943003: Revert of Classify navigations without page id in parallel to the existing classifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 #include "content/public/test/render_view_test.h" 5 #include "content/public/test/render_view_test.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "components/scheduler/renderer/renderer_scheduler.h" 8 #include "components/scheduler/renderer/renderer_scheduler.h"
9 #include "content/common/dom_storage/dom_storage_types.h" 9 #include "content/common/dom_storage/dom_storage_types.h"
10 #include "content/common/frame_messages.h" 10 #include "content/common/frame_messages.h"
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 impl->historyForwardListCount() + 1; 446 impl->historyForwardListCount() + 1;
447 int pending_offset = offset + impl->history_list_offset_; 447 int pending_offset = offset + impl->history_list_offset_;
448 448
449 CommonNavigationParams common_params( 449 CommonNavigationParams common_params(
450 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK, 450 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK,
451 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(), 451 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(),
452 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); 452 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL());
453 RequestNavigationParams request_params; 453 RequestNavigationParams request_params;
454 request_params.page_state = state; 454 request_params.page_state = state;
455 request_params.page_id = impl->page_id_ + offset; 455 request_params.page_id = impl->page_id_ + offset;
456 request_params.nav_entry_id = pending_offset + 1;
457 request_params.pending_history_list_offset = pending_offset; 456 request_params.pending_history_list_offset = pending_offset;
458 request_params.current_history_list_offset = impl->history_list_offset_; 457 request_params.current_history_list_offset = impl->history_list_offset_;
459 request_params.current_history_list_length = history_list_length; 458 request_params.current_history_list_length = history_list_length;
460 459
461 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(), 460 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(),
462 request_params); 461 request_params);
463 462
464 // The load actually happens asynchronously, so we pump messages to process 463 // The load actually happens asynchronously, so we pump messages to process
465 // the pending continuation. 464 // the pending continuation.
466 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); 465 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait();
467 } 466 }
468 467
469 } // namespace content 468 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/frame_navigate_params.cc ('k') | content/public/test/test_renderer_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698