[Managed users] Don't early-return when the default filtering behavior is ALLOW.

chrome/browser/managed_mode/managed_mode_url_filter.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/managed_mode/managed_mode_url_filter.h"
 
 #include "base/files/file_path.h"
 #include "base/hash_tables.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/metrics/histogram.h"
@@ skipping 175 matching lines @@
   replacements.ClearPassword();
   replacements.ClearQuery();
   replacements.ClearRef();
   return url.ReplaceComponents(replacements);
 }
 
 ManagedModeURLFilter::FilteringBehavior
 ManagedModeURLFilter::GetFilteringBehaviorForURL(const GURL& url) const {
   DCHECK(CalledOnValidThread());
 
-  // If the default behavior is to allow, we don't need to check anything else.
-  if (default_behavior_ == ALLOW)
-    return ALLOW;
-
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // URLs with a non-standard scheme (e.g. chrome://) are always allowed.
   if (!policy::URLBlacklist::HasStandardScheme(url))
     return ALLOW;
 #endif
 
   // Check manual overrides for the exact URL.
   std::map<GURL, bool>::const_iterator url_it = url_map_.find(Normalize(url));
   if (url_it != url_map_.end())
     return url_it->second ? ALLOW : BLOCK;
 
   // Check manual overrides for the hostname.
   std::map<std::string, bool>::const_iterator host_it =
       host_map_.find(url.host());
   if (host_it != host_map_.end())
     return host_it->second ? ALLOW : BLOCK;
 
+  // If the default behavior is to allow, we don't need to check anything else.
+  if (default_behavior_ == ALLOW)
+    return ALLOW;
+
   // Check the list of URL patterns.
   std::set<URLMatcherConditionSet::ID> matching_ids =
       contents_->url_matcher.MatchURL(url);
   if (!matching_ids.empty())
     return ALLOW;
 
   // Check the list of hostname hashes.
   std::string hash = base::SHA1HashString(url.host());
   std::string hash_hex = base::HexEncode(hash.data(), hash.length());
   if (contents_->hash_site_map.count(hash_hex))
@@ skipping 80 matching lines @@
 
 void ManagedModeURLFilter::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void ManagedModeURLFilter::SetContents(scoped_ptr<Contents> contents) {
   DCHECK(CalledOnValidThread());
   contents_ = contents.Pass();
   FOR_EACH_OBSERVER(Observer, observers_, OnSiteListUpdated());
 }