| OLD | NEW |
| 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/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 EXPECT_EQ(load_params.referrer.url, entry->GetReferrer().url); | 533 EXPECT_EQ(load_params.referrer.url, entry->GetReferrer().url); |
| 534 EXPECT_EQ(load_params.referrer.policy, entry->GetReferrer().policy); | 534 EXPECT_EQ(load_params.referrer.policy, entry->GetReferrer().policy); |
| 535 EXPECT_EQ(load_params.transition_type, entry->GetTransitionType()); | 535 EXPECT_EQ(load_params.transition_type, entry->GetTransitionType()); |
| 536 EXPECT_EQ(load_params.extra_headers, entry->extra_headers()); | 536 EXPECT_EQ(load_params.extra_headers, entry->extra_headers()); |
| 537 | 537 |
| 538 EXPECT_EQ(load_params.is_renderer_initiated, entry->is_renderer_initiated()); | 538 EXPECT_EQ(load_params.is_renderer_initiated, entry->is_renderer_initiated()); |
| 539 EXPECT_EQ(load_params.base_url_for_data_url, entry->GetBaseURLForDataURL()); | 539 EXPECT_EQ(load_params.base_url_for_data_url, entry->GetBaseURLForDataURL()); |
| 540 if (!load_params.virtual_url_for_data_url.is_empty()) { | 540 if (!load_params.virtual_url_for_data_url.is_empty()) { |
| 541 EXPECT_EQ(load_params.virtual_url_for_data_url, entry->GetVirtualURL()); | 541 EXPECT_EQ(load_params.virtual_url_for_data_url, entry->GetVirtualURL()); |
| 542 } | 542 } |
| 543 #if defined(OS_ANDROID) |
| 544 EXPECT_EQ(load_params.data_url_as_string, entry->GetDataURLAsString()); |
| 545 #endif |
| 543 if (NavigationController::UA_OVERRIDE_INHERIT != | 546 if (NavigationController::UA_OVERRIDE_INHERIT != |
| 544 load_params.override_user_agent) { | 547 load_params.override_user_agent) { |
| 545 bool should_override = (NavigationController::UA_OVERRIDE_TRUE == | 548 bool should_override = (NavigationController::UA_OVERRIDE_TRUE == |
| 546 load_params.override_user_agent); | 549 load_params.override_user_agent); |
| 547 EXPECT_EQ(should_override, entry->GetIsOverridingUserAgent()); | 550 EXPECT_EQ(should_override, entry->GetIsOverridingUserAgent()); |
| 548 } | 551 } |
| 549 EXPECT_EQ(load_params.browser_initiated_post_data.get(), | 552 EXPECT_EQ(load_params.browser_initiated_post_data.get(), |
| 550 entry->GetBrowserInitiatedPostData()); | 553 entry->GetBrowserInitiatedPostData()); |
| 551 EXPECT_EQ(load_params.transferred_global_request_id, | 554 EXPECT_EQ(load_params.transferred_global_request_id, |
| 552 entry->transferred_global_request_id()); | 555 entry->transferred_global_request_id()); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 load_params.base_url_for_data_url = GURL("http://foo"); | 591 load_params.base_url_for_data_url = GURL("http://foo"); |
| 589 load_params.virtual_url_for_data_url = GURL(url::kAboutBlankURL); | 592 load_params.virtual_url_for_data_url = GURL(url::kAboutBlankURL); |
| 590 load_params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE; | 593 load_params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE; |
| 591 | 594 |
| 592 controller.LoadURLWithParams(load_params); | 595 controller.LoadURLWithParams(load_params); |
| 593 NavigationEntryImpl* entry = controller.GetPendingEntry(); | 596 NavigationEntryImpl* entry = controller.GetPendingEntry(); |
| 594 | 597 |
| 595 CheckNavigationEntryMatchLoadParams(load_params, entry); | 598 CheckNavigationEntryMatchLoadParams(load_params, entry); |
| 596 } | 599 } |
| 597 | 600 |
| 601 #if defined(OS_ANDROID) |
| 602 TEST_F(NavigationControllerTest, LoadURLWithExtraParams_Data_Android) { |
| 603 NavigationControllerImpl& controller = controller_impl(); |
| 604 |
| 605 NavigationController::LoadURLParams load_params(GURL("data:,")); |
| 606 load_params.load_type = NavigationController::LOAD_TYPE_DATA; |
| 607 load_params.base_url_for_data_url = GURL("http://foo"); |
| 608 load_params.virtual_url_for_data_url = GURL(url::kAboutBlankURL); |
| 609 std::string s("data:,data"); |
| 610 load_params.data_url_as_string = base::RefCountedString::TakeString(&s); |
| 611 load_params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE; |
| 612 |
| 613 controller.LoadURLWithParams(load_params); |
| 614 NavigationEntryImpl* entry = controller.GetPendingEntry(); |
| 615 |
| 616 CheckNavigationEntryMatchLoadParams(load_params, entry); |
| 617 } |
| 618 #endif |
| 619 |
| 598 TEST_F(NavigationControllerTest, LoadURLWithExtraParams_HttpPost) { | 620 TEST_F(NavigationControllerTest, LoadURLWithExtraParams_HttpPost) { |
| 599 NavigationControllerImpl& controller = controller_impl(); | 621 NavigationControllerImpl& controller = controller_impl(); |
| 600 | 622 |
| 601 NavigationController::LoadURLParams load_params(GURL("https://posturl")); | 623 NavigationController::LoadURLParams load_params(GURL("https://posturl")); |
| 602 load_params.transition_type = ui::PAGE_TRANSITION_TYPED; | 624 load_params.transition_type = ui::PAGE_TRANSITION_TYPED; |
| 603 load_params.load_type = | 625 load_params.load_type = |
| 604 NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST; | 626 NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST; |
| 605 load_params.override_user_agent = NavigationController::UA_OVERRIDE_TRUE; | 627 load_params.override_user_agent = NavigationController::UA_OVERRIDE_TRUE; |
| 606 | 628 |
| 607 | 629 |
| (...skipping 4485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5093 EXPECT_EQ(default_ssl_status.connection_status, | 5115 EXPECT_EQ(default_ssl_status.connection_status, |
| 5094 details.ssl_status.connection_status); | 5116 details.ssl_status.connection_status); |
| 5095 EXPECT_EQ(default_ssl_status.content_status, | 5117 EXPECT_EQ(default_ssl_status.content_status, |
| 5096 details.ssl_status.content_status); | 5118 details.ssl_status.content_status); |
| 5097 EXPECT_EQ(0u, details.ssl_status.signed_certificate_timestamp_ids.size()); | 5119 EXPECT_EQ(0u, details.ssl_status.signed_certificate_timestamp_ids.size()); |
| 5098 | 5120 |
| 5099 EXPECT_EQ(1, main_test_rfh()->GetProcess()->bad_msg_count()); | 5121 EXPECT_EQ(1, main_test_rfh()->GetProcess()->bad_msg_count()); |
| 5100 } | 5122 } |
| 5101 | 5123 |
| 5102 } // namespace content | 5124 } // namespace content |
| OLD | NEW |