-
Notifications
You must be signed in to change notification settings - Fork 900
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Don't add brave url to history #1821
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| /* Copyright (c) 2019 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #define CanAddURLToHistory CanAddURLToHistory_ChromiumImpl | ||
| #include "../../../../../chrome/browser/history/history_utils.cc" // NOLINT | ||
| #undef CanAddURLToHistory | ||
|
|
||
| bool CanAddURLToHistory(const GURL& url) { | ||
| if (!CanAddURLToHistory_ChromiumImpl(url)) | ||
| return false; | ||
|
|
||
| return !url.SchemeIs(content::kBraveUIScheme); | ||
| } |
36 changes: 36 additions & 0 deletions
36
chromium_src/chrome/browser/history/history_utils_unittest.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* Copyright (c) 2019 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #include "chrome/browser/history/history_utils.h" | ||
| #include "components/previews/core/previews_experiments.h" | ||
| #include "net/base/url_util.h" | ||
| #include "testing/gtest/include/gtest/gtest.h" | ||
| #include "url/gurl.h" | ||
|
|
||
| namespace { | ||
| // Refered IsLitePageRedirectPreviewDomain() to make sample lite page url. | ||
| GURL GetSampleLitePageUrl() { | ||
| return net::AppendQueryParameter( | ||
| previews::params::GetLitePagePreviewsDomainURL(), | ||
| "u", "1234"); | ||
| } | ||
| } // namespace | ||
|
|
||
| // This test covers all cases that upstream and our version of | ||
| // CanAddURLToHistory(). | ||
| TEST(HistoryUtilsTest, VariousURLTest) { | ||
| EXPECT_TRUE(CanAddURLToHistory(GURL("https://www.brave.com/"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("brave://sync/"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("javascript://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("about://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("content://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("chrome-devtools://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("chrome://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("view-source://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("chrome-native://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("chrome-search://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GURL("chrome-distiller://test"))); | ||
| EXPECT_FALSE(CanAddURLToHistory(GetSampleLitePageUrl())); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we add some urls that should be added to history? Want to make sure that someone doesn't accidentally break this to return
falsefor everythingThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also some urls that should not be added based on the ChromiumImpl method?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we don't need to to check many urls because
CanAddURLToHistory()just checks scheme.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I see what you mean. will add more urls
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.