Refactored the URLBlacklistManager to avoid chrome/ and content/ dependencies.

chrome/browser/profiles/profile_io_data.cc

Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 197337900e35dc31274c94016b42b6d9f1f0a106..f5fdf6904b489b8b7bde0ef9dc617865e9e0ad17 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -45,7 +45,6 @@
 #include "chrome/browser/net/load_time_stats.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
-#include "chrome/browser/policy/url_blacklist_manager.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -53,6 +52,7 @@
 #include "chrome/browser/signin/signin_names_io_thread.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
@@ -83,8 +83,8 @@
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/cloud/policy_header_service.h"
 #include "chrome/browser/policy/cloud/policy_header_service_factory.h"
-#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
-#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
+#include "chrome/browser/policy/policy_helpers.h"
+#include "chrome/browser/policy/url_blacklist_manager.h"
 #include "components/policy/core/browser/policy_header_io_helper.h"
 #endif
 
@@ -489,7 +489,14 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
   // Don't pass it in |profile_params_| to make sure it is correctly cleaned up,
   // in particular when this ProfileIOData isn't |initialized_| during deletion.
 #if defined(ENABLE_CONFIGURATION_POLICY)
-  url_blacklist_manager_.reset(new policy::URLBlacklistManager(pref_service));
+  policy::URLBlacklist::SegmentURLCallback callback =
+      static_cast<policy::URLBlacklist::SegmentURLCallback>(
+          URLFixerUpper::SegmentURL);

[Elliot Glaysher, 2013/12/12 19:16:55]

Why do you need this cast here? Is it because of there are multiple overloads on
the name SegmentURL?

[Joao da Silva, 2013/12/13 11:00:01]

Yes, otherwise this fails because SegmentURL is ambiguous. If you know of a
better way to fix this then I'm happy to improve it.

(if the overloaded name were in policy/ code I'd happily rename one of the
functions, but in this case I don't think it's worth it)

+  url_blacklist_manager_.reset(
+      new policy::URLBlacklistManager(pref_service,
+                                      io_message_loop_proxy,
+                                      callback,
+                                      policy::SkipBlacklistForURL));
 
   if (!is_incognito()) {
     // Add policy headers for non-incognito requests.