ensure URLs are valid

Author: antonok-edm

browser/net/brave_ad_block_tp_network_delegate_helper.cc

@@ -207,8 +207,9 @@ EngineFlags ShouldBlockRequestOnTaskRunner(
       &previous_result.did_match_important, &ctx->mock_data_url,
       &rewritten_url);
 
-  if (ctx->method == "GET" || ctx->method == "HEAD" ||
-      ctx->method == "OPTIONS") {
+  if (GURL(rewritten_url).is_valid() &&
+      (ctx->method == "GET" || ctx->method == "HEAD" ||
+       ctx->method == "OPTIONS")) {
     ctx->new_url_spec = rewritten_url;
   }
 

components/brave_shields/browser/domain_block_navigation_throttle.cc

@@ -162,8 +162,8 @@ DomainBlockNavigationThrottle::WillProcessResponse() {
 void DomainBlockNavigationThrottle::OnShouldBlockDomain(
     std::pair<bool, std::string> block_result) {
   const bool should_block = block_result.first;
-  const std::string new_url_spec = block_result.second;
-  if (!should_block && new_url_spec.empty()) {
+  const GURL new_url(block_result.second);
+  if (!should_block && !new_url.is_valid()) {
     DomainBlockTabStorage* tab_storage = DomainBlockTabStorage::FromWebContents(
         navigation_handle()->GetWebContents());
     if (tab_storage)
@@ -172,7 +172,7 @@ void DomainBlockNavigationThrottle::OnShouldBlockDomain(
     // runner, but now we know that we want to allow navigation to continue.
     Resume();
     return;
-  } else if (!new_url_spec.empty()) {
+  } else if (new_url.is_valid()) {
     content::NavigationHandle* handle = navigation_handle();
 
     content::WebContents* contents = handle->GetWebContents();
@@ -182,8 +182,6 @@ void DomainBlockNavigationThrottle::OnShouldBlockDomain(
     CancelDeferredNavigation(content::NavigationThrottle::ThrottleCheckResult(
         content::NavigationThrottle::CANCEL));
 
-    const GURL new_url(new_url_spec);
-
     content::OpenURLParams params =
         content::OpenURLParams::FromNavigationHandle(handle);
     params.url = new_url;