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

Side by Side Diff: content/renderer/render_view_browsertest.cc

Issue 872473003: PlzNavigate: Remove the RequestNavigation IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits + fix compilation error Created 5 years, 10 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/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.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 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/memory/shared_memory.h" 8 #include "base/memory/shared_memory.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 } 357 }
358 358
359 TEST_F(RenderViewImplTest, OnNavigationHttpPost) { 359 TEST_F(RenderViewImplTest, OnNavigationHttpPost) {
360 FrameMsg_Navigate_Params nav_params; 360 FrameMsg_Navigate_Params nav_params;
361 361
362 // An http url will trigger a resource load so cannot be used here. 362 // An http url will trigger a resource load so cannot be used here.
363 nav_params.common_params.url = GURL("data:text/html,<div>Page</div>"); 363 nav_params.common_params.url = GURL("data:text/html,<div>Page</div>");
364 nav_params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL; 364 nav_params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
365 nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED; 365 nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
366 nav_params.page_id = -1; 366 nav_params.page_id = -1;
367 nav_params.request_params.is_post = true; 367 nav_params.is_post = true;
368 nav_params.commit_params.browser_navigation_start = 368 nav_params.commit_params.browser_navigation_start =
369 base::TimeTicks::FromInternalValue(1); 369 base::TimeTicks::FromInternalValue(1);
370 370
371 // Set up post data. 371 // Set up post data.
372 const unsigned char* raw_data = reinterpret_cast<const unsigned char*>( 372 const unsigned char* raw_data = reinterpret_cast<const unsigned char*>(
373 "post \0\ndata"); 373 "post \0\ndata");
374 const unsigned int length = 11; 374 const unsigned int length = 11;
375 const std::vector<unsigned char> post_data(raw_data, raw_data + length); 375 const std::vector<unsigned char> post_data(raw_data, raw_data + length);
376 nav_params.request_params.browser_initiated_post_data = post_data; 376 nav_params.browser_initiated_post_data = post_data;
377 377
378 frame()->OnNavigate(nav_params); 378 frame()->OnNavigate(nav_params);
379 ProcessPendingMessages(); 379 ProcessPendingMessages();
380 380
381 const IPC::Message* frame_navigate_msg = 381 const IPC::Message* frame_navigate_msg =
382 render_thread_->sink().GetUniqueMessageMatching( 382 render_thread_->sink().GetUniqueMessageMatching(
383 FrameHostMsg_DidCommitProvisionalLoad::ID); 383 FrameHostMsg_DidCommitProvisionalLoad::ID);
384 EXPECT_TRUE(frame_navigate_msg); 384 EXPECT_TRUE(frame_navigate_msg);
385 385
386 FrameHostMsg_DidCommitProvisionalLoad::Param host_nav_params; 386 FrameHostMsg_DidCommitProvisionalLoad::Param host_nav_params;
(...skipping 1854 matching lines...) Expand 10 before | Expand all | Expand 10 after
2241 // Verify that a navigation that claims to have started at the earliest 2241 // Verify that a navigation that claims to have started at the earliest
2242 // possible TimeTicks is indeed reported as one that started before 2242 // possible TimeTicks is indeed reported as one that started before
2243 // OnNavigate() is called. 2243 // OnNavigate() is called.
2244 base::Time before_navigation = base::Time::Now(); 2244 base::Time before_navigation = base::Time::Now();
2245 FrameMsg_Navigate_Params early_nav_params; 2245 FrameMsg_Navigate_Params early_nav_params;
2246 early_nav_params.common_params.url = GURL("data:text/html,<div>Page</div>"); 2246 early_nav_params.common_params.url = GURL("data:text/html,<div>Page</div>");
2247 early_nav_params.common_params.navigation_type = 2247 early_nav_params.common_params.navigation_type =
2248 FrameMsg_Navigate_Type::NORMAL; 2248 FrameMsg_Navigate_Type::NORMAL;
2249 early_nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED; 2249 early_nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
2250 early_nav_params.page_id = -1; 2250 early_nav_params.page_id = -1;
2251 early_nav_params.request_params.is_post = true; 2251 early_nav_params.is_post = true;
2252 early_nav_params.commit_params.browser_navigation_start = 2252 early_nav_params.commit_params.browser_navigation_start =
2253 base::TimeTicks::FromInternalValue(1); 2253 base::TimeTicks::FromInternalValue(1);
2254 2254
2255 frame()->OnNavigate(early_nav_params); 2255 frame()->OnNavigate(early_nav_params);
2256 ProcessPendingMessages(); 2256 ProcessPendingMessages();
2257 2257
2258 base::Time early_nav_reported_start = 2258 base::Time early_nav_reported_start =
2259 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart()); 2259 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart());
2260 EXPECT_LT(early_nav_reported_start, before_navigation); 2260 EXPECT_LT(early_nav_reported_start, before_navigation);
2261 2261
2262 // Verify that a navigation that claims to have started in the future - 42 2262 // Verify that a navigation that claims to have started in the future - 42
2263 // days from now is *not* reported as one that starts in the future; as we 2263 // days from now is *not* reported as one that starts in the future; as we
2264 // sanitize the override allowing a maximum of ::Now(). 2264 // sanitize the override allowing a maximum of ::Now().
2265 FrameMsg_Navigate_Params late_nav_params; 2265 FrameMsg_Navigate_Params late_nav_params;
2266 late_nav_params.common_params.url = 2266 late_nav_params.common_params.url =
2267 GURL("data:text/html,<div>Another page</div>"); 2267 GURL("data:text/html,<div>Another page</div>");
2268 late_nav_params.common_params.navigation_type = 2268 late_nav_params.common_params.navigation_type =
2269 FrameMsg_Navigate_Type::NORMAL; 2269 FrameMsg_Navigate_Type::NORMAL;
2270 late_nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED; 2270 late_nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
2271 late_nav_params.page_id = -1; 2271 late_nav_params.page_id = -1;
2272 late_nav_params.request_params.is_post = true; 2272 late_nav_params.is_post = true;
2273 late_nav_params.commit_params.browser_navigation_start = 2273 late_nav_params.commit_params.browser_navigation_start =
2274 base::TimeTicks::Now() + base::TimeDelta::FromDays(42); 2274 base::TimeTicks::Now() + base::TimeDelta::FromDays(42);
2275 2275
2276 frame()->OnNavigate(late_nav_params); 2276 frame()->OnNavigate(late_nav_params);
2277 ProcessPendingMessages(); 2277 ProcessPendingMessages();
2278 base::Time after_navigation = 2278 base::Time after_navigation =
2279 base::Time::Now() + base::TimeDelta::FromDays(1); 2279 base::Time::Now() + base::TimeDelta::FromDays(1);
2280 2280
2281 base::Time late_nav_reported_start = 2281 base::Time late_nav_reported_start =
2282 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart()); 2282 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart());
(...skipping 29 matching lines...) Expand all
2312 2312
2313 gfx::Size size = GetPreferredSize(); 2313 gfx::Size size = GetPreferredSize();
2314 EXPECT_EQ(gfx::Size(400, 400), size); 2314 EXPECT_EQ(gfx::Size(400, 400), size);
2315 2315
2316 SetZoomLevel(ZoomFactorToZoomLevel(2.0)); 2316 SetZoomLevel(ZoomFactorToZoomLevel(2.0));
2317 size = GetPreferredSize(); 2317 size = GetPreferredSize();
2318 EXPECT_EQ(gfx::Size(800, 800), size); 2318 EXPECT_EQ(gfx::Size(800, 800), size);
2319 } 2319 }
2320 2320
2321 } // namespace content 2321 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698