Remove LOAD_SUB_FRAME load flag.

chrome/browser/net/chrome_network_delegate.cc

 // Copyright (c) 2012 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/net/chrome_network_delegate.h"
 
 #include <stdlib.h>
 
 #include <vector>
 
@@ skipping 359 matching lines @@
     GURL* new_url) {
   // TODO(mmenke): Remove ScopedTracker below once crbug.com/456327 is fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "456327 URLRequest::ChromeNetworkDelegate::OnBeforeURLRequest"));
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // TODO(joaodasilva): This prevents extensions from seeing URLs that are
   // blocked. However, an extension might redirect the request to another URL,
   // which is not blocked.
+
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   int error = net::ERR_BLOCKED_BY_ADMINISTRATOR;
-  if (url_blacklist_manager_ &&
-      url_blacklist_manager_->IsRequestBlocked(*request, &error)) {
+  if (info && content::IsResourceTypeFrame(info->GetResourceType()) &&

[Andrew T Wilson (Slow), 2015/05/12 16:44:30]

Under what situations might info be null? I want to make sure there isn't some
way for frame loads to skip the blacklist check below...

[mmenke, 2015/05/12 16:59:13]

If a request doesn't go through the ResourceDispatcherHost (In which case, it
wouldn't be a main frame page load, either).  So most anything issued from the
browser process.

+      url_blacklist_manager_ &&
+      url_blacklist_manager_->ShouldBlockRequestForFrame(
+          request->url(), &error)) {
     // URL access blocked by policy.
     request->net_log().AddEvent(
         net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
         net::NetLog::StringCallback("url",
                                     &request->url().possibly_invalid_spec()));
     return error;
   }
 #endif
 
   // TODO(mmenke): Remove ScopedTracker below once crbug.com/456327 is fixed.
@@ skipping 310 matching lines @@
   return experimental_web_platform_features_enabled_;
 }
 
 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
     const net::URLRequest& request,
     const GURL& target_url,
     const GURL& referrer_url) const {
   ReportInvalidReferrerSend(target_url, referrer_url);
   return true;
 }