PlzNavigate: set the error code in NavigationHandle on abort

extensions/browser/extension_navigation_throttle.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/extension_navigation_throttle.h"
 
 #include "components/guest_view/browser/guest_view_base.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 72 matching lines @@
         std::string resource_path = url.path();
         bool is_guest = WebViewGuest::GetGuestPartitionConfigForSite(
             navigation_handle()->GetStartingSiteInstance()->GetSiteURL(),
             &partition_domain, &partition_id, &in_memory);
 
         bool allowed = true;
         url_request_util::AllowCrossRendererResourceLoadHelper(
             is_guest, extension, owner_extension, partition_id, resource_path,
             navigation_handle()->GetPageTransition(), &allowed);
         if (!allowed)
-          return content::NavigationThrottle::CANCEL;
+          return content::NavigationThrottle::BLOCK_REQUEST;

[clamy, 2017/01/26 15:33:45]

Some tests expect this particular return code when this is triggered. I'm not
sure how they passed previously.

[Devlin, 2017/01/26 15:50:17]

Which tests?  I wonder if the return on line 64 should also be returning
BLOCK_REQUEST instead of cancel?

[clamy, 2017/01/26 15:58:06]

The issue was with
WebViewTests/WebViewTest.Shim_TestLoadAbortChromeExtensionURLWrongPartition/0.

[nasko, 2017/01/26 17:20:18]

Let's ensure that we pick the right error code we believe this code should be
returning. Tests can be fixed too. There is non-trivial difference between
cancelling and blocking, which one is the semantically correct here?

[clamy, 2017/01/27 17:21:51]

I've modified the other return, still letting the tests run to see if everything
is ok with it.

       }
     }
 
     return content::NavigationThrottle::PROCEED;
   }
 
   // Now enforce web_accessible_resources for navigations. Top-level navigations
   // should always be allowed.
 
   // If the navigation is not to a chrome-extension:// URL, no need to perform
@@ skipping 50 matching lines @@
 
   if (WebAccessibleResourcesInfo::IsResourceWebAccessible(extension,
                                                           resource_path)) {
     return content::NavigationThrottle::PROCEED;
   }
 
   return content::NavigationThrottle::BLOCK_REQUEST;
 }
 
 }  // namespace extensions