Add ManagedModeURLFilter.

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 "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ skipping 15 matching lines @@
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/socket_stream/socket_stream.h"
 #include "net/url_request/url_request.h"
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/managed_mode_url_filter.h"
+#endif
+
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #endif
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/url_blacklist_manager.h"
 #endif
 
 using content::BrowserThread;
 using content::RenderViewHost;
@@ skipping 76 matching lines @@
                    status, profile_id, process_id, render_view_id));
   }
 }
 
 }  // namespace
 
 ChromeNetworkDelegate::ChromeNetworkDelegate(
     extensions::EventRouterForwarder* event_router,
     ExtensionInfoMap* extension_info_map,
     const policy::URLBlacklistManager* url_blacklist_manager,
+    const ManagedModeURLFilter* managed_mode_url_filter,
     void* profile,
     CookieSettings* cookie_settings,
     BooleanPrefMember* enable_referrers,
     chrome_browser_net::CacheStats* cache_stats)
     : event_router_(event_router),
       profile_(profile),
       cookie_settings_(cookie_settings),
       extension_info_map_(extension_info_map),
       enable_referrers_(enable_referrers),
       url_blacklist_manager_(url_blacklist_manager),
+      managed_mode_url_filter_(managed_mode_url_filter),
       cache_stats_(cache_stats) {
   DCHECK(event_router);
   DCHECK(enable_referrers);
   DCHECK(!profile || cookie_settings);
 }
 
 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
 
 // static
 void ChromeNetworkDelegate::NeverThrottleRequests() {
@@ skipping 26 matching lines @@
       url_blacklist_manager_->IsURLBlocked(request->url())) {
     // 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 net::ERR_NETWORK_ACCESS_DENIED;
   }
 #endif
 
+#if !defined(OS_ANDROID)

[willchan no longer on Chromium, 2012/08/14 17:12:29]

Why is this not on for Android?

[Bernhard Bauer, 2012/08/14 23:36:32]

ManagedModeURLFilter depends on policy code for whitelisting (they share the
pattern syntax, for example), which isn't included on Android. It probably makes
more sense to key it off ENABLE_CONFIGURATION_POLICY than OS_ANDROID though.

+  if (managed_mode_url_filter_ &&
+      !managed_mode_url_filter_->IsURLWhitelisted(request->url())) {
+    // Block for now.
+    return net::ERR_NETWORK_ACCESS_DENIED;
+  }
+#endif
+
   ForwardRequestStatus(REQUEST_STARTED, request, profile_);
 
   if (!enable_referrers_->GetValue())
     request->set_referrer(std::string());
   return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
       profile_, extension_info_map_.get(), request, callback, new_url);
 }
 
 int ChromeNetworkDelegate::OnBeforeSendHeaders(
     net::URLRequest* request,
@@ skipping 198 matching lines @@
 #endif
   return net::OK;
 }
 
 void ChromeNetworkDelegate::OnCacheWaitStateChange(
     const net::URLRequest& request,
     CacheWaitState state) {
   if (cache_stats_)
     cache_stats_->OnCacheWaitStateChange(request, state);
 }