Commit bac67e8b authored by Eugene But's avatar Eugene But Committed by Commit Bot

Rename PageActionInPageNavigation to PageActionSameDocumentNavigation.

Old name was presumably used to match was_within_same_page IPC, but
SameDocument name better reflects the the type of the navigation
(navigation did not change the document object).

This change will make naming more consistent with the rest of Chromium
code.

Bug: 695189
Change-Id: If70aa7b7b315773a496db08fc2b7878465b5c5b4
Reviewed-on: https://chromium-review.googlesource.com/912104Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#536757}
parent b5aaf37e
...@@ -74,8 +74,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) { ...@@ -74,8 +74,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) {
ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0));
} }
// Tests that we don't lose the page action icon on in-page navigations. // Tests that we don't lose the page action icon on same-document navigations.
IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionInPageNavigation) { IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionSameDocumentNavigation) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
base::FilePath extension_path(test_data_dir_.AppendASCII("api_test") base::FilePath extension_path(test_data_dir_.AppendASCII("api_test")
...@@ -88,12 +88,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionInPageNavigation) { ...@@ -88,12 +88,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionInPageNavigation) {
ui_test_utils::NavigateToURL(browser(), feed_url); ui_test_utils::NavigateToURL(browser(), feed_url);
ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1));
// In-page navigation, page action should remain. // Same-document navigation, page action should remain.
feed_url = embedded_test_server()->GetURL(kHashPageAHash); feed_url = embedded_test_server()->GetURL(kHashPageAHash);
ui_test_utils::NavigateToURL(browser(), feed_url); ui_test_utils::NavigateToURL(browser(), feed_url);
ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1));
// Not an in-page navigation, page action should go away. // Not a same-document navigation, page action should go away.
feed_url = embedded_test_server()->GetURL(kHashPageB); feed_url = embedded_test_server()->GetURL(kHashPageB);
ui_test_utils::NavigateToURL(browser(), feed_url); ui_test_utils::NavigateToURL(browser(), feed_url);
ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment