Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: ios/chrome/browser/net/ios_chrome_network_delegate.cc

Issue 1456783004: Remove configuration policy on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up gyp and DEPS Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/net/ios_chrome_network_delegate.h ('k') | ios/chrome/browser/prefs/browser_prefs.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/net/ios_chrome_network_delegate.cc
diff --git a/ios/chrome/browser/net/ios_chrome_network_delegate.cc b/ios/chrome/browser/net/ios_chrome_network_delegate.cc
index 19bcb456efb880b93b9e104a65bf5f2d1af13e91..782699067bd72232fa50ba1812475de85d6e9ac3 100644
--- a/ios/chrome/browser/net/ios_chrome_network_delegate.cc
+++ b/ios/chrome/browser/net/ios_chrome_network_delegate.cc
@@ -28,10 +28,6 @@
#include "net/log/net_log.h"
#include "net/url_request/url_request.h"
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#include "components/policy/core/browser/url_blacklist_manager.h"
-#endif
-
namespace {
const char kDNTHeader[] = "DNT";
@@ -73,9 +69,6 @@ void RecordNetworkErrorHistograms(const net::URLRequest* request) {
IOSChromeNetworkDelegate::IOSChromeNetworkDelegate()
: enable_do_not_track_(nullptr),
-#if defined(ENABLE_CONFIGURATION_POLICY)
- url_blacklist_manager_(nullptr),
-#endif
domain_reliability_monitor_(nullptr) {
}
@@ -102,22 +95,6 @@ int IOSChromeNetworkDelegate::OnBeforeURLRequest(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"456327 URLRequest::IOSChromeNetworkDelegate::OnBeforeURLRequest"));
-#if defined(ENABLE_CONFIGURATION_POLICY)
- int error = net::ERR_BLOCKED_BY_ADMINISTRATOR;
- // iOS cannot check the resource type, block everything.
- // See http://crbug.com/338283 and http://crbug.com/489704
- if (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.
tracked_objects::ScopedTracker tracking_profile2(
FROM_HERE_WITH_EXPLICIT_FUNCTION(
« no previous file with comments | « ios/chrome/browser/net/ios_chrome_network_delegate.h ('k') | ios/chrome/browser/prefs/browser_prefs.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698