Skip to content

Commit

Permalink
Remove url_param_filter on desktop
Browse files Browse the repository at this point in the history
This is mostly a revert of https://crrev.com/c/3523276 and
https://crrev.com/c/3542510. Future cleanup will remove the
component_updater implementation and the iOS code; this targets the
actual functionality changes on desktop.

Bug: 1380927
Change-Id: I4868aa7875c01b557ee81e4fdc16ac0d754c2780
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4008681
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Matt Reichhoff <mreichhoff@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1068227}
  • Loading branch information
mreichhoff authored and Chromium LUCI CQ committed Nov 7, 2022
1 parent e73981d commit 12bb01a
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 1,417 deletions.
6 changes: 0 additions & 6 deletions chrome/browser/chrome_content_browser_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@
#include "components/site_isolation/site_isolation_policy.h"
#include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h"
#include "components/translate/core/common/translate_switches.h"
#include "components/url_param_filter/content/url_param_filter_throttle.h"
#include "components/variations/variations_associated_data.h"
#include "components/variations/variations_switches.h"
#include "content/public/browser/browser_accessibility_state.h"
Expand Down Expand Up @@ -5105,11 +5104,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
ChromeNavigationUIData* chrome_navigation_ui_data =
static_cast<ChromeNavigationUIData*>(navigation_ui_data);

url_param_filter::UrlParamFilterThrottle::MaybeCreateThrottle(
profile->GetPrefs()->GetBoolean(
policy::policy_prefs::kUrlParamFilterEnabled),
wc_getter.Run(), request, &result);

#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
bool matches_enterprise_allowlist = safe_browsing::IsURLAllowlistedByPolicy(
request.url, *profile->GetPrefs());
Expand Down
6 changes: 0 additions & 6 deletions chrome/browser/ui/browser_navigator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
#include "components/captive_portal/core/buildflags.h"
#include "components/no_state_prefetch/browser/no_state_prefetch_manager.h"
#include "components/prefs/pref_service.h"
#include "components/url_param_filter/content/cross_otr_web_contents_observer.h"
#include "content/public/browser/browser_url_handler.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_service.h"
Expand Down Expand Up @@ -574,11 +573,6 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
->set_is_captive_portal_window();
}
#endif
url_param_filter::CrossOtrWebContentsObserver::MaybeCreateForWebContents(
target_contents.get(),
params.privacy_sensitivity ==
NavigateParams::PrivacySensitivity::CROSS_OTR,
params.started_from_context_menu, params.transition);

return target_contents;
}
Expand Down
5 changes: 0 additions & 5 deletions chrome/browser/ui/browser_navigator_params.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ void NavigateParams::FillNavigateParamsFromOpenURLParams(
this->blob_url_loader_factory = params.blob_url_loader_factory;
this->href_translate = params.href_translate;
this->impression = params.impression;
// `disposition` is eventually coerced out of OFF_THE_RECORD, so we maintain
// this field separately.
if (params.disposition == WindowOpenDisposition::OFF_THE_RECORD) {
this->privacy_sensitivity = PrivacySensitivity::CROSS_OTR;
}

// Implementation notes:
// The following NavigateParams don't have an equivalent in OpenURLParams:
Expand Down
5 changes: 0 additions & 5 deletions chrome/browser/ui/browser_navigator_params.h
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,6 @@ struct NavigateParams {
// observed and fall back to using http scheme if necessary.
bool is_using_https_as_default_scheme = false;

// Indicates the degree of privacy sensitivity for the navigation.
// Can be used to drive privacy decisions.
enum class PrivacySensitivity { CROSS_OTR, CROSS_PROFILE, DEFAULT };
PrivacySensitivity privacy_sensitivity = PrivacySensitivity::DEFAULT;

private:
NavigateParams();
};
Expand Down
42 changes: 0 additions & 42 deletions chrome/browser/ui/browser_navigator_params_unittest.cc

This file was deleted.

0 comments on commit 12bb01a

Please sign in to comment.