NavigationThrottle: allow customization of net::Error when blocking

chrome/browser/supervised_user/supervised_user_google_auth_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 "chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
@@ skipping 56 matching lines @@
   if (!google_util::IsGoogleSearchUrl(url) &&
       !google_util::IsGoogleHomePageUrl(url) &&
       !google_util::IsYoutubeDomainUrl(url, google_util::ALLOW_SUBDOMAIN,
                                        google_util::ALLOW_NON_STANDARD_PORTS)) {
     return content::NavigationThrottle::PROCEED;
   }
 
   content::NavigationThrottle::ThrottleCheckResult result =
       ShouldProceed(child_account_service_->IsGoogleAuthenticated());
 
-  if (result == content::NavigationThrottle::DEFER) {
+  if (result.action() == content::NavigationThrottle::DEFER) {
     google_auth_state_subscription_ =
         child_account_service_->ObserveGoogleAuthState(
             base::Bind(&SupervisedUserGoogleAuthNavigationThrottle::
                            OnGoogleAuthStateChanged,
                        base::Unretained(this)));
   }
 
   return result;
 }
 
 void SupervisedUserGoogleAuthNavigationThrottle::OnGoogleAuthStateChanged(
     bool authenticated) {
   content::NavigationThrottle::ThrottleCheckResult result =
       ShouldProceed(authenticated);
 
-  switch (result) {
+  switch (result.action()) {
     case content::NavigationThrottle::PROCEED: {
       google_auth_state_subscription_.reset();
       navigation_handle()->Resume();
       break;
     }
     case content::NavigationThrottle::CANCEL:
     case content::NavigationThrottle::CANCEL_AND_IGNORE: {
       navigation_handle()->CancelDeferredNavigation(result);
       break;
     }
@@ skipping 41 matching lines @@
   if (reauth_successful) {
     // If reauthentication was not successful, wait until the cookies are
     // refreshed, which will call us back separately.
     return;
   }
 
   // Otherwise cancel immediately.
   navigation_handle()->CancelDeferredNavigation(
       content::NavigationThrottle::CANCEL_AND_IGNORE);
 }