Commit 4d50036b authored by pliard@chromium.org's avatar pliard@chromium.org

Disable uses of URLBlacklist on platforms that don't support it.

This was causing linking issues on the Linux Redux bot.


Review URL: https://chromiumcodereview.appspot.com/10827411

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152396 0039d316-1c4b-4281-b951-d872f2087c98
parent 33c66e34
......@@ -25,6 +25,7 @@ scoped_ptr<URLMatcher> CreateWhitelistOnBlockingPoolThread(
scoped_ptr<URLMatcher> url_matcher(new URLMatcher());
URLMatcherConditionSet::Vector all_conditions;
#if defined(ENABLE_CONFIGURATION_POLICY)
URLMatcherConditionSet::ID id = 0;
for (std::vector<std::string>::const_iterator it = patterns.begin();
it != patterns.end(); ++it) {
......@@ -45,6 +46,7 @@ scoped_ptr<URLMatcher> CreateWhitelistOnBlockingPoolThread(
scheme, host, match_subdomains, port, path);
all_conditions.push_back(condition_set);
}
#endif
url_matcher->AddConditionSets(all_conditions);
return url_matcher.Pass();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment