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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/browser/frame_host/navigation_controller_impl_unittest.cc

Issue 84703003: Allow data URL > 2MB for loadDataWithBaseURL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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 | Annotate | Revision Log
« android_webview/java/src/org/chromium/android_webview/AwContents.java ('K') | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigation_entry_impl.h » ('j') | content/common/content_param_traits.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/file_util.h" 7 #include "base/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 void CheckNavigationEntryMatchLoadParams( 471 void CheckNavigationEntryMatchLoadParams(
472 NavigationController::LoadURLParams& load_params, 472 NavigationController::LoadURLParams& load_params,
473 NavigationEntryImpl* entry) { 473 NavigationEntryImpl* entry) {
474 EXPECT_EQ(load_params.url, entry->GetURL()); 474 EXPECT_EQ(load_params.url, entry->GetURL());
475 EXPECT_EQ(load_params.referrer.url, entry->GetReferrer().url); 475 EXPECT_EQ(load_params.referrer.url, entry->GetReferrer().url);
476 EXPECT_EQ(load_params.referrer.policy, entry->GetReferrer().policy); 476 EXPECT_EQ(load_params.referrer.policy, entry->GetReferrer().policy);
477 EXPECT_EQ(load_params.transition_type, entry->GetTransitionType()); 477 EXPECT_EQ(load_params.transition_type, entry->GetTransitionType());
478 EXPECT_EQ(load_params.extra_headers, entry->extra_headers()); 478 EXPECT_EQ(load_params.extra_headers, entry->extra_headers());
479 479
480 EXPECT_EQ(load_params.is_renderer_initiated, entry->is_renderer_initiated()); 480 EXPECT_EQ(load_params.is_renderer_initiated, entry->is_renderer_initiated());
481 EXPECT_EQ(load_params.data_for_data_url, entry->GetDataForDataURL());
481 EXPECT_EQ(load_params.base_url_for_data_url, entry->GetBaseURLForDataURL()); 482 EXPECT_EQ(load_params.base_url_for_data_url, entry->GetBaseURLForDataURL());
482 if (!load_params.virtual_url_for_data_url.is_empty()) { 483 if (!load_params.virtual_url_for_data_url.is_empty()) {
483 EXPECT_EQ(load_params.virtual_url_for_data_url, entry->GetVirtualURL()); 484 EXPECT_EQ(load_params.virtual_url_for_data_url, entry->GetVirtualURL());
484 } 485 }
485 if (NavigationController::UA_OVERRIDE_INHERIT != 486 if (NavigationController::UA_OVERRIDE_INHERIT !=
486 load_params.override_user_agent) { 487 load_params.override_user_agent) {
487 bool should_override = (NavigationController::UA_OVERRIDE_TRUE == 488 bool should_override = (NavigationController::UA_OVERRIDE_TRUE ==
488 load_params.override_user_agent); 489 load_params.override_user_agent);
489 EXPECT_EQ(should_override, entry->GetIsOverridingUserAgent()); 490 EXPECT_EQ(should_override, entry->GetIsOverridingUserAgent());
490 } 491 }
(...skipping 27 matching lines...) Expand all
518 519
519 CheckNavigationEntryMatchLoadParams(load_params, entry); 520 CheckNavigationEntryMatchLoadParams(load_params, entry);
520 } 521 }
521 522
522 TEST_F(NavigationControllerTest, LoadURLWithExtraParams_Data) { 523 TEST_F(NavigationControllerTest, LoadURLWithExtraParams_Data) {
523 NavigationControllerImpl& controller = controller_impl(); 524 NavigationControllerImpl& controller = controller_impl();
524 525
525 NavigationController::LoadURLParams load_params( 526 NavigationController::LoadURLParams load_params(
526 GURL("data:text/html,dataurl")); 527 GURL("data:text/html,dataurl"));
527 load_params.load_type = NavigationController::LOAD_TYPE_DATA; 528 load_params.load_type = NavigationController::LOAD_TYPE_DATA;
529 load_params.data_for_data_url = new base::RefCountedStaticMemory(
530 reinterpret_cast<const uint8*>("<body>Hello world</body>"), 24);
528 load_params.base_url_for_data_url = GURL("http://foo"); 531 load_params.base_url_for_data_url = GURL("http://foo");
529 load_params.virtual_url_for_data_url = GURL(kAboutBlankURL); 532 load_params.virtual_url_for_data_url = GURL(kAboutBlankURL);
530 load_params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE; 533 load_params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE;
531 534
532 controller.LoadURLWithParams(load_params); 535 controller.LoadURLWithParams(load_params);
533 NavigationEntryImpl* entry = 536 NavigationEntryImpl* entry =
534 NavigationEntryImpl::FromNavigationEntry( 537 NavigationEntryImpl::FromNavigationEntry(
535 controller.GetPendingEntry()); 538 controller.GetPendingEntry());
536 539
537 CheckNavigationEntryMatchLoadParams(load_params, entry); 540 CheckNavigationEntryMatchLoadParams(load_params, entry);
(...skipping 3297 matching lines...) Expand 10 before | Expand all | Expand 10 after
3835 EXPECT_EQ(1, controller.GetEntryCount()); 3838 EXPECT_EQ(1, controller.GetEntryCount());
3836 EXPECT_EQ(0, controller.GetCurrentEntryIndex()); 3839 EXPECT_EQ(0, controller.GetCurrentEntryIndex());
3837 EXPECT_EQ(0, controller.GetLastCommittedEntryIndex()); 3840 EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
3838 EXPECT_EQ(-1, controller.GetPendingEntryIndex()); 3841 EXPECT_EQ(-1, controller.GetPendingEntryIndex());
3839 EXPECT_FALSE(controller.CanGoBack()); 3842 EXPECT_FALSE(controller.CanGoBack());
3840 EXPECT_FALSE(controller.CanGoForward()); 3843 EXPECT_FALSE(controller.CanGoForward());
3841 EXPECT_EQ(url4, controller.GetVisibleEntry()->GetURL()); 3844 EXPECT_EQ(url4, controller.GetVisibleEntry()->GetURL());
3842 } 3845 }
3843 3846
3844 } // namespace content 3847 } // namespace content
OLDNEW
« android_webview/java/src/org/chromium/android_webview/AwContents.java ('K') | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigation_entry_impl.h » ('j') | content/common/content_param_traits.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698