Skip to content

Commit

Permalink
Replace GURL static initializers with functions in components/
Browse files Browse the repository at this point in the history
This is a necessary pre-cursor to cleaning up scheme initialization.
No GURLs should be created before schemes are modified/added and GURL
is ready to use. Enforcement of this will come in a followup CL.

See the bug for additional context.

Replacing static initalizers with functions ensures the GURLs are
only initialized when used, which happens after test setup.

Bug: 783819
Change-Id: Ib93ce491807221c17b0bf5b8dd688cf103ae5027
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2008048
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734179}
  • Loading branch information
Michael Thiessen authored and Commit Bot committed Jan 22, 2020
1 parent 5e97ac9 commit 29e2c19
Show file tree
Hide file tree
Showing 38 changed files with 1,050 additions and 800 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,29 @@ TEST_F(ChromeSerializedNavigationDriverTest, SanitizeWithReferrerPolicyAlways) {
static_cast<int>(network::mojom::ReferrerPolicy::kAlways), &navigation);

content::PageState page_state =
content::PageState::CreateFromURL(sessions::test_data::kVirtualURL);
content::PageState::CreateFromURL(sessions::test_data::VirtualUrl());
sessions::SerializedNavigationEntryTestHelper::SetEncodedPageState(
page_state.ToEncodedData(), &navigation);

driver->Sanitize(&navigation);
EXPECT_EQ(sessions::test_data::kIndex, navigation.index());
EXPECT_EQ(sessions::test_data::kUniqueID, navigation.unique_id());
EXPECT_EQ(sessions::test_data::kReferrerURL, navigation.referrer_url());
EXPECT_EQ(sessions::test_data::ReferrerUrl(), navigation.referrer_url());
EXPECT_EQ(static_cast<int>(network::mojom::ReferrerPolicy::kAlways),
navigation.referrer_policy());
EXPECT_EQ(sessions::test_data::kVirtualURL, navigation.virtual_url());
EXPECT_EQ(sessions::test_data::VirtualUrl(), navigation.virtual_url());
EXPECT_EQ(sessions::test_data::kTitle, navigation.title());
EXPECT_EQ(page_state.ToEncodedData(), navigation.encoded_page_state());
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
navigation.transition_type(), sessions::test_data::kTransitionType));
EXPECT_EQ(sessions::test_data::kHasPostData, navigation.has_post_data());
EXPECT_EQ(sessions::test_data::kPostID, navigation.post_id());
EXPECT_EQ(sessions::test_data::kOriginalRequestURL,
EXPECT_EQ(sessions::test_data::OriginalRequestUrl(),
navigation.original_request_url());
EXPECT_EQ(sessions::test_data::kIsOverridingUserAgent,
navigation.is_overriding_user_agent());
EXPECT_EQ(sessions::test_data::kTimestamp, navigation.timestamp());
EXPECT_EQ(sessions::test_data::kFaviconURL, navigation.favicon_url());
EXPECT_EQ(sessions::test_data::FaviconUrl(), navigation.favicon_url());
EXPECT_EQ(sessions::test_data::kHttpStatusCode,
navigation.http_status_code());
}
Expand All @@ -77,7 +77,7 @@ TEST_F(ChromeSerializedNavigationDriverTest, SanitizeWithReferrerPolicyNever) {
static_cast<int>(network::mojom::ReferrerPolicy::kNever), &navigation);

content::PageState page_state =
content::PageState::CreateFromURL(sessions::test_data::kVirtualURL);
content::PageState::CreateFromURL(sessions::test_data::VirtualUrl());
sessions::SerializedNavigationEntryTestHelper::SetEncodedPageState(
page_state.ToEncodedData(), &navigation);

Expand All @@ -86,18 +86,18 @@ TEST_F(ChromeSerializedNavigationDriverTest, SanitizeWithReferrerPolicyNever) {
// Fields that should remain untouched.
EXPECT_EQ(sessions::test_data::kIndex, navigation.index());
EXPECT_EQ(sessions::test_data::kUniqueID, navigation.unique_id());
EXPECT_EQ(sessions::test_data::kVirtualURL, navigation.virtual_url());
EXPECT_EQ(sessions::test_data::VirtualUrl(), navigation.virtual_url());
EXPECT_EQ(sessions::test_data::kTitle, navigation.title());
EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
navigation.transition_type(), sessions::test_data::kTransitionType));
EXPECT_EQ(sessions::test_data::kHasPostData, navigation.has_post_data());
EXPECT_EQ(sessions::test_data::kPostID, navigation.post_id());
EXPECT_EQ(sessions::test_data::kOriginalRequestURL,
EXPECT_EQ(sessions::test_data::OriginalRequestUrl(),
navigation.original_request_url());
EXPECT_EQ(sessions::test_data::kIsOverridingUserAgent,
navigation.is_overriding_user_agent());
EXPECT_EQ(sessions::test_data::kTimestamp, navigation.timestamp());
EXPECT_EQ(sessions::test_data::kFaviconURL, navigation.favicon_url());
EXPECT_EQ(sessions::test_data::FaviconUrl(), navigation.favicon_url());
EXPECT_EQ(sessions::test_data::kHttpStatusCode,
navigation.http_status_code());

Expand Down
Loading

0 comments on commit 29e2c19

Please sign in to comment.