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 1121083004: 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 <cctype> 7 #include <cctype>
8 8
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "components/scheduler/renderer/renderer_scheduler.h" 10 #include "components/scheduler/renderer/renderer_scheduler.h"
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 impl->historyForwardListCount() + 1; 527 impl->historyForwardListCount() + 1;
528 int pending_offset = offset + impl->history_list_offset_; 528 int pending_offset = offset + impl->history_list_offset_;
529 529
530 CommonNavigationParams common_params( 530 CommonNavigationParams common_params(
531 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK, 531 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK,
532 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(), 532 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(),
533 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); 533 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL());
534 RequestNavigationParams request_params; 534 RequestNavigationParams request_params;
535 request_params.page_state = state; 535 request_params.page_state = state;
536 request_params.page_id = impl->page_id_ + offset; 536 request_params.page_id = impl->page_id_ + offset;
537 request_params.nav_entry_id = pending_offset + 1;
538 request_params.pending_history_list_offset = pending_offset; 537 request_params.pending_history_list_offset = pending_offset;
539 request_params.current_history_list_offset = impl->history_list_offset_; 538 request_params.current_history_list_offset = impl->history_list_offset_;
540 request_params.current_history_list_length = history_list_length; 539 request_params.current_history_list_length = history_list_length;
541 540
542 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(), 541 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(),
543 request_params); 542 request_params);
544 543
545 // The load actually happens asynchronously, so we pump messages to process 544 // The load actually happens asynchronously, so we pump messages to process
546 // the pending continuation. 545 // the pending continuation.
547 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); 546 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait();
548 } 547 }
549 548
550 } // namespace content 549 } // 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