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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/frame_host/render_frame_host_manager_unittest.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/loader/cross_site_resource_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index 468b01e573ac662adefd6400dc2e5486f22cc88a..b23ecc97c42afdce13cb883c2ecd2120e086a4a8 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -29,7 +29,6 @@
#include "content/public/common/bindings_policy.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/javascript_message_type.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/common/url_constants.h"
#include "content/public/common/url_utils.h"
#include "content/public/test/mock_render_process_host.h"
@@ -40,6 +39,7 @@
#include "content/test/test_render_view_host.h"
#include "content/test/test_web_contents.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/page_transition_types.h"
namespace content {
namespace {
@@ -278,7 +278,8 @@ class RenderFrameHostManagerTest
// Note: we navigate the active RenderFrameHost because previous navigations
// won't have committed yet, so NavigateAndCommit does the wrong thing
// for us.
- controller().LoadURL(url, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ controller().LoadURL(
+ url, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
TestRenderViewHost* old_rvh = test_rvh();
// Simulate the BeforeUnload_ACK that is received from the current renderer
@@ -355,7 +356,7 @@ class RenderFrameHostManagerTest
// Navigate to a cross-site URL.
contents()->GetController().LoadURL(
- kDestUrl, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ kDestUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
EXPECT_TRUE(contents()->cross_navigation_pending());
// Manually increase the number of active views in the
@@ -417,7 +418,7 @@ TEST_F(RenderFrameHostManagerTest, NewTabPageProcesses) {
// a RFH that's not pending (since there is no cross-site transition), so
// we use the committed one.
contents2->GetController().LoadURL(
- kChromeUrl, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ kChromeUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
TestRenderFrameHost* ntp_rfh2 = contents2->GetMainFrame();
EXPECT_FALSE(contents2->cross_navigation_pending());
ntp_rfh2->SendNavigate(100, kChromeUrl);
@@ -425,7 +426,7 @@ TEST_F(RenderFrameHostManagerTest, NewTabPageProcesses) {
// The second one is the opposite, creating a cross-site transition and
// requiring a beforeunload ack.
contents2->GetController().LoadURL(
- kDestUrl, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ kDestUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
EXPECT_TRUE(contents2->cross_navigation_pending());
TestRenderFrameHost* dest_rfh2 = contents2->GetPendingMainFrame();
ASSERT_TRUE(dest_rfh2);
@@ -446,7 +447,7 @@ TEST_F(RenderFrameHostManagerTest, NewTabPageProcesses) {
EXPECT_FALSE(contents()->GetPendingMainFrame());
contents2->GetController().LoadURL(
- kChromeUrl, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ kChromeUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
dest_rfh2->GetRenderViewHost()->SendBeforeUnloadACK(true);
contents2->GetPendingMainFrame()->SendNavigate(102, kChromeUrl);
@@ -739,7 +740,7 @@ TEST_F(RenderFrameHostManagerTest, AlwaysSendEnableViewSourceMode) {
// Navigate.
controller().LoadURL(
- kUrl, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kUrl, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// Simulate response from RenderFrame for DispatchBeforeUnload.
base::TimeTicks now = base::TimeTicks::Now();
contents()->GetMainFrame()->OnMessageReceived(FrameHostMsg_BeforeUnload_ACK(
@@ -762,7 +763,7 @@ TEST_F(RenderFrameHostManagerTest, AlwaysSendEnableViewSourceMode) {
process()->sink().ClearMessages();
// Navigate, again.
controller().LoadURL(
- kUrl, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+ kUrl, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
// The same RenderViewHost should be reused.
EXPECT_FALSE(contents()->GetPendingMainFrame());
EXPECT_TRUE(last_rfh == contents()->GetMainFrame());
@@ -817,7 +818,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) {
const GURL kUrl1("http://www.google.com/");
NavigationEntryImpl entry1(
NULL /* instance */, -1 /* page_id */, kUrl1, Referrer(),
- base::string16() /* title */, PAGE_TRANSITION_TYPED,
+ base::string16() /* title */, ui::PAGE_TRANSITION_TYPED,
false /* is_renderer_init */);
host = manager->Navigate(entry1);
@@ -839,7 +840,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) {
NavigationEntryImpl entry2(
NULL /* instance */, -1 /* page_id */, kUrl2,
Referrer(kUrl1, blink::WebReferrerPolicyDefault),
- base::string16() /* title */, PAGE_TRANSITION_LINK,
+ base::string16() /* title */, ui::PAGE_TRANSITION_LINK,
true /* is_renderer_init */);
host = manager->Navigate(entry2);
@@ -859,7 +860,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) {
NavigationEntryImpl entry3(
NULL /* instance */, -1 /* page_id */, kUrl3,
Referrer(kUrl2, blink::WebReferrerPolicyDefault),
- base::string16() /* title */, PAGE_TRANSITION_LINK,
+ base::string16() /* title */, ui::PAGE_TRANSITION_LINK,
false /* is_renderer_init */);
host = manager->Navigate(entry3);
@@ -897,7 +898,7 @@ TEST_F(RenderFrameHostManagerTest, WebUI) {
const GURL kUrl("chrome://foo");
NavigationEntryImpl entry(NULL /* instance */, -1 /* page_id */, kUrl,
Referrer(), base::string16() /* title */,
- PAGE_TRANSITION_TYPED,
+ ui::PAGE_TRANSITION_TYPED,
false /* is_renderer_init */);
RenderFrameHostImpl* host = manager->Navigate(entry);
@@ -948,7 +949,7 @@ TEST_F(RenderFrameHostManagerTest, WebUIInNewTab) {
const GURL kUrl1("chrome://foo");
NavigationEntryImpl entry1(NULL /* instance */, -1 /* page_id */, kUrl1,
Referrer(), base::string16() /* title */,
- PAGE_TRANSITION_TYPED,
+ ui::PAGE_TRANSITION_TYPED,
false /* is_renderer_init */);
RenderFrameHostImpl* host1 = manager1->Navigate(entry1);
@@ -979,7 +980,7 @@ TEST_F(RenderFrameHostManagerTest, WebUIInNewTab) {
const GURL kUrl2("chrome://foo/bar");
NavigationEntryImpl entry2(NULL /* instance */, -1 /* page_id */, kUrl2,
Referrer(), base::string16() /* title */,
- PAGE_TRANSITION_LINK,
+ ui::PAGE_TRANSITION_LINK,
true /* is_renderer_init */);
RenderFrameHostImpl* host2 = manager2->Navigate(entry2);
@@ -1019,7 +1020,7 @@ TEST_F(RenderFrameHostManagerTest, PageDoesBackAndReload) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = 1;
params.url = kUrl2;
- params.transition = PAGE_TRANSITION_CLIENT_REDIRECT;
+ params.transition = ui::PAGE_TRANSITION_CLIENT_REDIRECT;
params.should_update_history = false;
params.gesture = NavigationGestureAuto;
params.was_within_same_page = false;
@@ -1396,7 +1397,7 @@ TEST_F(RenderFrameHostManagerTest, NoSwapOnGuestNavigations) {
const GURL kUrl1("http://www.google.com/");
NavigationEntryImpl entry1(
NULL /* instance */, -1 /* page_id */, kUrl1, Referrer(),
- base::string16() /* title */, PAGE_TRANSITION_TYPED,
+ base::string16() /* title */, ui::PAGE_TRANSITION_TYPED,
false /* is_renderer_init */);
host = manager->Navigate(entry1);
@@ -1419,7 +1420,7 @@ TEST_F(RenderFrameHostManagerTest, NoSwapOnGuestNavigations) {
NavigationEntryImpl entry2(
NULL /* instance */, -1 /* page_id */, kUrl2,
Referrer(kUrl1, blink::WebReferrerPolicyDefault),
- base::string16() /* title */, PAGE_TRANSITION_LINK,
+ base::string16() /* title */, ui::PAGE_TRANSITION_LINK,
true /* is_renderer_init */);
host = manager->Navigate(entry2);
@@ -1455,7 +1456,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyClose) {
const GURL kUrl1("http://www.google.com/");
NavigationEntryImpl entry1(NULL /* instance */, -1 /* page_id */, kUrl1,
Referrer(), base::string16() /* title */,
- PAGE_TRANSITION_TYPED,
+ ui::PAGE_TRANSITION_TYPED,
false /* is_renderer_init */);
RenderFrameHostImpl* host = manager->Navigate(entry1);
@@ -1481,7 +1482,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyClose) {
const GURL kUrl2("http://www.example.com");
NavigationEntryImpl entry2(
NULL /* instance */, -1 /* page_id */, kUrl2, Referrer(),
- base::string16() /* title */, PAGE_TRANSITION_TYPED,
+ base::string16() /* title */, ui::PAGE_TRANSITION_TYPED,
false /* is_renderer_init */);
RenderFrameHostImpl* host2 = manager->Navigate(entry2);
@@ -1519,7 +1520,8 @@ TEST_F(RenderFrameHostManagerTest, DeleteFrameAfterSwapOutACK) {
rfh1->GetRenderViewHost()->rvh_state());
// Navigate to new site, simulating onbeforeunload approval.
- controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ controller().LoadURL(
+ kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
base::TimeTicks now = base::TimeTicks::Now();
contents()->GetMainFrame()->OnMessageReceived(
FrameHostMsg_BeforeUnload_ACK(0, true, now, now));
@@ -1536,7 +1538,7 @@ TEST_F(RenderFrameHostManagerTest, DeleteFrameAfterSwapOutACK) {
rfh1->GetRenderViewHost()->rvh_state());
// The new page commits.
- contents()->TestDidNavigate(rfh2, 1, kUrl2, PAGE_TRANSITION_TYPED);
+ contents()->TestDidNavigate(rfh2, 1, kUrl2, ui::PAGE_TRANSITION_TYPED);
EXPECT_FALSE(contents()->cross_navigation_pending());
EXPECT_EQ(rfh2, contents()->GetMainFrame());
EXPECT_TRUE(contents()->GetPendingMainFrame() == NULL);
@@ -1572,7 +1574,8 @@ TEST_F(RenderFrameHostManagerTest, SwapOutFrameAfterSwapOutACK) {
rfh1->GetSiteInstance())->increment_active_view_count();
// Navigate to new site, simulating onbeforeunload approval.
- controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ controller().LoadURL(
+ kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
base::TimeTicks now = base::TimeTicks::Now();
contents()->GetMainFrame()->OnMessageReceived(
FrameHostMsg_BeforeUnload_ACK(0, true, now, now));
@@ -1582,7 +1585,7 @@ TEST_F(RenderFrameHostManagerTest, SwapOutFrameAfterSwapOutACK) {
TestRenderFrameHost* rfh2 = contents()->GetPendingMainFrame();
// The new page commits.
- contents()->TestDidNavigate(rfh2, 1, kUrl2, PAGE_TRANSITION_TYPED);
+ contents()->TestDidNavigate(rfh2, 1, kUrl2, ui::PAGE_TRANSITION_TYPED);
EXPECT_FALSE(contents()->cross_navigation_pending());
EXPECT_EQ(rfh2, contents()->GetMainFrame());
EXPECT_TRUE(contents()->GetPendingMainFrame() == NULL);
@@ -1621,7 +1624,8 @@ TEST_F(RenderFrameHostManagerTest,
rfh1->GetSiteInstance())->increment_active_view_count();
// Navigate to new site, simulating onbeforeunload approval.
- controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ controller().LoadURL(
+ kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
base::TimeTicks now = base::TimeTicks::Now();
rfh1->OnMessageReceived(
FrameHostMsg_BeforeUnload_ACK(0, true, now, now));
@@ -1629,7 +1633,7 @@ TEST_F(RenderFrameHostManagerTest,
TestRenderFrameHost* rfh2 = contents()->GetPendingMainFrame();
// The new page commits.
- contents()->TestDidNavigate(rfh2, 1, kUrl2, PAGE_TRANSITION_TYPED);
+ contents()->TestDidNavigate(rfh2, 1, kUrl2, ui::PAGE_TRANSITION_TYPED);
EXPECT_FALSE(contents()->cross_navigation_pending());
EXPECT_EQ(rfh2, contents()->GetMainFrame());
EXPECT_TRUE(contents()->GetPendingMainFrame() == NULL);
@@ -1661,7 +1665,8 @@ TEST_F(RenderFrameHostManagerTest,
EXPECT_EQ(RenderViewHostImpl::STATE_DEFAULT, rvh1->rvh_state());
// Navigate to a new site, starting a cross-site navigation.
- controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ controller().LoadURL(
+ kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
{
pending_rfh = contents()->GetFrameTree()->root()->render_manager()
->pending_frame_host();
@@ -1678,7 +1683,8 @@ TEST_F(RenderFrameHostManagerTest,
}
// Start another cross-site navigation.
- controller().LoadURL(kUrl2, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ controller().LoadURL(
+ kUrl2, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
{
pending_rfh = contents()->GetFrameTree()->root()->render_manager()
->pending_frame_host();
@@ -1750,7 +1756,7 @@ TEST_F(RenderFrameHostManagerTest,
EnableBrowserSideNavigation();
EXPECT_FALSE(main_test_rfh()->render_view_host()->IsRenderViewLive());
contents()->GetController().LoadURL(
- kUrl, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
RenderFrameHostManager* render_manager =
main_test_rfh()->frame_tree_node()->render_manager();
NavigationRequest* main_request =
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/loader/cross_site_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698