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

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

Issue 1002803002: Classify navigations without page id in parallel to the existing classifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: relax the dcheck 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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 impl->historyForwardListCount() + 1; 534 impl->historyForwardListCount() + 1;
535 int pending_offset = offset + impl->history_list_offset_; 535 int pending_offset = offset + impl->history_list_offset_;
536 536
537 CommonNavigationParams common_params( 537 CommonNavigationParams common_params(
538 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK, 538 GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK,
539 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(), 539 FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(),
540 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); 540 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL());
541 RequestNavigationParams request_params; 541 RequestNavigationParams request_params;
542 request_params.page_state = state; 542 request_params.page_state = state;
543 request_params.page_id = impl->page_id_ + offset; 543 request_params.page_id = impl->page_id_ + offset;
544 request_params.nav_entry_id = pending_offset + 1;
544 request_params.pending_history_list_offset = pending_offset; 545 request_params.pending_history_list_offset = pending_offset;
545 request_params.current_history_list_offset = impl->history_list_offset_; 546 request_params.current_history_list_offset = impl->history_list_offset_;
546 request_params.current_history_list_length = history_list_length; 547 request_params.current_history_list_length = history_list_length;
547 548
548 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(), 549 impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(),
549 request_params); 550 request_params);
550 551
551 // The load actually happens asynchronously, so we pump messages to process 552 // The load actually happens asynchronously, so we pump messages to process
552 // the pending continuation. 553 // the pending continuation.
553 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); 554 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait();
554 } 555 }
555 556
556 } // namespace content 557 } // 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