|
1 | 1 | --- a/chrome/browser/BUILD.gn |
2 | 2 | +++ b/chrome/browser/BUILD.gn |
3 | | -@@ -3800,8 +3800,6 @@ static_library("browser") { |
| 3 | +@@ -3803,8 +3803,6 @@ static_library("browser") { |
4 | 4 | "download/download_auto_open_policy_handler.cc", |
5 | 5 | "download/download_auto_open_policy_handler.h", |
6 | 6 | "download/download_commands.cc", |
|
11 | 11 | "download/download_dir_util.cc", |
12 | 12 | --- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc |
13 | 13 | +++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc |
14 | | -@@ -405,10 +405,6 @@ void CreateAndAddChromeThrottlesForNavig |
| 14 | +@@ -394,10 +394,6 @@ void CreateAndAddChromeThrottlesForNavig |
15 | 15 | Profile::FromBrowserContext(context)), |
16 | 16 | SafeSearchFactory::GetForBrowserContext(context))); |
17 | 17 |
|
|
76 | 76 | } |
77 | 77 | --- a/chrome/browser/extensions/api/downloads/downloads_api.cc |
78 | 78 | +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc |
79 | | -@@ -86,7 +86,6 @@ |
| 79 | +@@ -87,7 +87,6 @@ |
80 | 80 | #endif |
81 | 81 |
|
82 | 82 | #if BUILDFLAG(ENABLE_EXTENSIONS) |
83 | 83 | -#include "chrome/browser/download/download_danger_prompt.h" |
84 | | - #include "chrome/browser/download/download_open_prompt.h" |
85 | 84 | #include "chrome/browser/ui/browser.h" |
86 | 85 | #include "chrome/browser/ui/browser_window.h" |
87 | | -@@ -1359,9 +1358,6 @@ DownloadsAcceptDangerFunction::Downloads |
| 86 | + #endif |
| 87 | +@@ -1364,9 +1363,6 @@ DownloadsAcceptDangerFunction::Downloads |
88 | 88 |
|
89 | 89 | DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() = default; |
90 | 90 |
|
|
94 | 94 | ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { |
95 | 95 | std::optional<downloads::AcceptDanger::Params> params = |
96 | 96 | downloads::AcceptDanger::Params::Create(args()); |
97 | | -@@ -1412,50 +1408,13 @@ void DownloadsAcceptDangerFunction::Prom |
| 97 | +@@ -1417,50 +1413,13 @@ void DownloadsAcceptDangerFunction::Prom |
98 | 98 | } |
99 | 99 | RecordApiFunctions(DownloadsFunctionName::kDownloadsFunctionAcceptDanger); |
100 | 100 | #if BUILDFLAG(ENABLE_EXTENSIONS) |
|
156 | 156 | #include "chrome/common/extensions/api/downloads.h" |
157 | 157 | #include "components/download/content/public/all_download_item_notifier.h" |
158 | 158 | #include "components/download/public/common/download_path_reservation_tracker.h" |
159 | | -@@ -170,13 +169,6 @@ class DownloadsRemoveFileFunction : publ |
| 159 | +@@ -169,13 +168,6 @@ class DownloadsRemoveFileFunction : publ |
160 | 160 |
|
161 | 161 | class DownloadsAcceptDangerFunction : public ExtensionFunction { |
162 | 162 | public: |
|
170 | 170 | DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER) |
171 | 171 | DownloadsAcceptDangerFunction(); |
172 | 172 |
|
173 | | -@@ -188,13 +180,10 @@ class DownloadsAcceptDangerFunction : pu |
| 173 | +@@ -187,13 +179,10 @@ class DownloadsAcceptDangerFunction : pu |
174 | 174 |
|
175 | 175 | protected: |
176 | 176 | ~DownloadsAcceptDangerFunction() override; |
|
186 | 186 | class DownloadsShowFunction : public ExtensionFunction { |
187 | 187 | --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc |
188 | 188 | +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc |
189 | | -@@ -706,18 +706,6 @@ void WebstorePrivateBeginInstallWithMani |
| 189 | +@@ -689,18 +689,6 @@ void WebstorePrivateBeginInstallWithMani |
190 | 190 |
|
191 | 191 | void WebstorePrivateBeginInstallWithManifest3Function:: |
192 | 192 | ReportFrictionAcceptedEvent() { |
|
205 | 205 | } |
206 | 206 |
|
207 | 207 | void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( |
208 | | ---- a/chrome/browser/extensions/blocklist_state_fetcher.cc |
209 | | -+++ b/chrome/browser/extensions/blocklist_state_fetcher.cc |
210 | | -@@ -78,8 +78,7 @@ void BlocklistStateFetcher::SendRequest( |
211 | | - std::string request_str; |
212 | | - request.SerializeToString(&request_str); |
213 | | - |
214 | | -- GURL request_url = GURL(safe_browsing::GetReportUrl( |
215 | | -- *safe_browsing_config_, "clientreport/crx-list-info")); |
216 | | -+ GURL request_url = GURL(); |
217 | | - net::NetworkTrafficAnnotationTag traffic_annotation = |
218 | | - net::DefineNetworkTrafficAnnotation("extension_blacklist", R"( |
219 | | - semantics { |
220 | | -@@ -134,12 +133,6 @@ void BlocklistStateFetcher::SendRequest( |
221 | | - base::Unretained(this), fetcher)); |
222 | | - } |
223 | | - |
224 | | --void BlocklistStateFetcher::SetSafeBrowsingConfig( |
225 | | -- const safe_browsing::V4ProtocolConfig& config) { |
226 | | -- safe_browsing_config_ = |
227 | | -- std::make_unique<safe_browsing::V4ProtocolConfig>(config); |
228 | | --} |
229 | | -- |
230 | | - void BlocklistStateFetcher::OnURLLoaderComplete( |
231 | | - network::SimpleURLLoader* url_loader, |
232 | | - std::unique_ptr<std::string> response_body) { |
233 | | ---- a/chrome/browser/extensions/blocklist_state_fetcher.h |
234 | | -+++ b/chrome/browser/extensions/blocklist_state_fetcher.h |
235 | | -@@ -39,8 +39,6 @@ class BlocklistStateFetcher { |
236 | | - |
237 | | - virtual void Request(const std::string& id, RequestCallback callback); |
238 | | - |
239 | | -- void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config); |
240 | | -- |
241 | | - protected: |
242 | | - void OnURLLoaderComplete(network::SimpleURLLoader* url_loader, |
243 | | - std::unique_ptr<std::string> response_body); |
244 | 208 | --- a/chrome/browser/safe_browsing/BUILD.gn |
245 | 209 | +++ b/chrome/browser/safe_browsing/BUILD.gn |
246 | 210 | @@ -7,6 +7,7 @@ import("//components/safe_browsing/build |
|
251 | 215 | sources = [ |
252 | 216 | "chrome_controller_client.cc", |
253 | 217 | "chrome_controller_client.h", |
254 | | -@@ -81,6 +82,7 @@ static_library("safe_browsing") { |
| 218 | +@@ -82,6 +83,7 @@ static_library("safe_browsing") { |
255 | 219 | "//services/metrics/public/cpp:ukm_builders", |
256 | 220 | "//services/preferences/public/cpp", |
257 | 221 | ] |
258 | 222 | + } |
259 | 223 |
|
260 | 224 | if (enable_extensions) { |
261 | 225 | deps += [ "//chrome/browser/ui/web_applications" ] |
262 | | -@@ -616,6 +618,7 @@ static_library("advanced_protection") { |
| 226 | +@@ -614,6 +616,7 @@ static_library("advanced_protection") { |
263 | 227 | } |
264 | 228 |
|
265 | 229 | source_set("metrics_collector") { |
266 | 230 | + if (false) { |
267 | 231 | sources = [ |
268 | 232 | "safe_browsing_metrics_collector_factory.cc", |
269 | 233 | "safe_browsing_metrics_collector_factory.h", |
270 | | -@@ -635,6 +638,7 @@ source_set("metrics_collector") { |
| 234 | +@@ -633,6 +636,7 @@ source_set("metrics_collector") { |
271 | 235 | "//components/safe_browsing/core/common:safe_browsing_prefs", |
272 | 236 | "//content/public/browser", |
273 | 237 | ] |
|
320 | 284 | #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h" |
321 | 285 | --- a/chrome/renderer/chrome_content_renderer_client.cc |
322 | 286 | +++ b/chrome/renderer/chrome_content_renderer_client.cc |
323 | | -@@ -114,7 +114,6 @@ |
| 287 | +@@ -111,7 +111,6 @@ |
324 | 288 | #include "components/pdf/common/pdf_util.h" |
325 | 289 | #include "components/permissions/features.h" |
326 | 290 | #include "components/safe_browsing/buildflags.h" |
327 | 291 | -#include "components/safe_browsing/content/renderer/threat_dom_details.h" |
328 | 292 | #include "components/sampling_profiler/process_type.h" |
329 | 293 | #include "components/sampling_profiler/thread_profiler.h" |
330 | 294 | #include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h" |
| 295 | +--- a/extensions/browser/blocklist_state_fetcher.cc |
| 296 | ++++ b/extensions/browser/blocklist_state_fetcher.cc |
| 297 | +@@ -67,8 +67,7 @@ void BlocklistStateFetcher::SendRequest( |
| 298 | + std::string request_str; |
| 299 | + request.SerializeToString(&request_str); |
| 300 | + |
| 301 | +- GURL request_url = GURL(safe_browsing::GetReportUrl( |
| 302 | +- *safe_browsing_config_, "clientreport/crx-list-info")); |
| 303 | ++ GURL request_url = GURL(); |
| 304 | + net::NetworkTrafficAnnotationTag traffic_annotation = |
| 305 | + net::DefineNetworkTrafficAnnotation("extension_blacklist", R"( |
| 306 | + semantics { |
| 307 | +@@ -132,12 +131,6 @@ void BlocklistStateFetcher::SendRequest( |
| 308 | + base::Unretained(this), fetcher)); |
| 309 | + } |
| 310 | + |
| 311 | +-void BlocklistStateFetcher::SetSafeBrowsingConfig( |
| 312 | +- const safe_browsing::V4ProtocolConfig& config) { |
| 313 | +- safe_browsing_config_ = |
| 314 | +- std::make_unique<safe_browsing::V4ProtocolConfig>(config); |
| 315 | +-} |
| 316 | +- |
| 317 | + void BlocklistStateFetcher::OnURLLoaderComplete( |
| 318 | + network::SimpleURLLoader* url_loader, |
| 319 | + std::unique_ptr<std::string> response_body) { |
| 320 | +--- a/extensions/browser/blocklist_state_fetcher.h |
| 321 | ++++ b/extensions/browser/blocklist_state_fetcher.h |
| 322 | +@@ -40,8 +40,6 @@ class BlocklistStateFetcher { |
| 323 | + |
| 324 | + virtual void Request(const std::string& id, RequestCallback callback); |
| 325 | + |
| 326 | +- void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config); |
| 327 | +- |
| 328 | + protected: |
| 329 | + void OnURLLoaderComplete(network::SimpleURLLoader* url_loader, |
| 330 | + std::unique_ptr<std::string> response_body); |
0 commit comments