Introduced the URLBlacklistManager, and wired it to various places.

chrome/browser/policy/url_blacklist_manager.cc

+// Copyright (c) 2011 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/policy/url_blacklist_manager.h"
+
+#include "base/bind.h"
+#include "base/values.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/pref_names.h"
+#include "content/browser/browser_thread.h"
+#include "content/common/notification_details.h"
+#include "content/common/notification_source.h"
+#include "googleurl/src/gurl.h"
+
+namespace policy {
+
+namespace {
+
+// Time to wait before starting an update of the blacklist. Scheduling another
+// update during this period will reset the timer.
+const int64 kUpdateDelayMs = 1000;
+
+// Maximum filters per policy. Filters over this index are ignored.
+const size_t kMaxFiltersPerPolicy = 100;
+
+typedef std::vector<std::string> StringVector;
+
+StringVector* ListValueToStringVector(const base::ListValue* list) {
+  StringVector* vector = new StringVector;
+
+  if (!list)
+    return vector;
+
+  vector->reserve(list->GetSize());
+  std::string s;
+  for (base::ListValue::const_iterator it = list->begin();
+       it != list->end() && vector->size() < kMaxFiltersPerPolicy; ++it) {
+    if ((*it)->GetAsString(&s))
+      vector->push_back(s);
+  }
+
+  return vector;
+}
+
+// A task that builds the blacklist on the FILE thread.
+void BuildBlacklist(linked_ptr<Blacklist> blacklist,
+                    linked_ptr<StringVector> block,
+                    linked_ptr<StringVector> allow) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+
+  // TODO(joaodasilva): This is a work in progress. http://crbug.com/49612
+  // Builds |blacklist| using the filters in |block| and |allow|.
+}
+
+// A task that owns the Blacklist, and passes it to the URLBlacklistManager
+// on the IO thread, if the URLBlacklistManager still exists.
+void SetBlacklistOnIO(base::WeakPtr<URLBlacklistManager> url_blacklist_manager,
+                      linked_ptr<Blacklist> blacklist) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  if (url_blacklist_manager)
+    url_blacklist_manager->SetBlacklist(blacklist);
+}
+
+}  // namespace
+
+URLBlacklistManager::URLBlacklistManager(PrefService* pref_service)
+    : ALLOW_THIS_IN_INITIALIZER_LIST(ui_method_factory_(this)),
+      pref_service_(pref_service),
+      ALLOW_THIS_IN_INITIALIZER_LIST(io_weak_ptr_factory_(this)),
+      blacklist_(new Blacklist) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  pref_change_registrar_.Init(pref_service_);
+  pref_change_registrar_.Add(prefs::kUrlBlacklist, this);
+  pref_change_registrar_.Add(prefs::kUrlWhitelist, this);
+
+  // Start enforcing the policies without a delay when they are present at
+  // startup.
+  if (pref_service_->HasPrefPath(prefs::kUrlBlacklist))
+    Update();
+}
+
+void URLBlacklistManager::ShutdownOnUIThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  // Cancel any pending updates, and stop listening for pref change updates.
+  ui_method_factory_.RevokeAll();
+  pref_change_registrar_.RemoveAll();
+}
+
+URLBlacklistManager::~URLBlacklistManager() {

[willchan no longer on Chromium, 2011/09/02 16:39:26]

Can you add a DCHECK here for BrowserThread::IO?

[Joao da Silva, 2011/09/02 17:35:20]

Done.

+}
+
+void URLBlacklistManager::Observe(int type,
+                                  const NotificationSource& source,
+                                  const NotificationDetails& details) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(type == chrome::NOTIFICATION_PREF_CHANGED);
+  PrefService* prefs = Source<PrefService>(source).ptr();
+  DCHECK(prefs == pref_service_);
+  std::string* pref_name = Details<std::string>(details).ptr();
+  DCHECK(*pref_name == prefs::kUrlBlacklist ||
+         *pref_name == prefs::kUrlWhitelist);
+  ScheduleUpdate();
+}
+
+void URLBlacklistManager::ScheduleUpdate() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  // Cancel pending updates, if any.
+  ui_method_factory_.RevokeAll();
+  PostUpdateTask(
+      ui_method_factory_.NewRunnableMethod(&URLBlacklistManager::Update));
+}
+
+void URLBlacklistManager::PostUpdateTask(Task* task) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  // This is overriden in tests to post the task without the delay.

[willchan no longer on Chromium, 2011/09/02 16:39:26]

overridden

[Joao da Silva, 2011/09/02 17:35:20]

Done.

+  MessageLoop::current()->PostDelayedTask(FROM_HERE, task, kUpdateDelayMs);

[willchan no longer on Chromium, 2011/09/02 16:39:26]

I had toyed earlier with replacing this with base::Timer, which would get rid of
the ui_method_factory_ use for the most part as well. But it doesn't let you
override for tests like you've done here.

+}
+
+void URLBlacklistManager::Update() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // The preferences can only be read on the UI thread. The linked_ptrs manage
+  // the memory while the task is in flight, and release it in case the task
+  // in cancelled (e.g. during shutdown).
+  linked_ptr<StringVector> block(

[willchan no longer on Chromium, 2011/09/02 16:39:26]

linked_ptr doesn't work because it isn't threadsafe. The linked_ptr on the stack
here and the linked_ptr bound into the closure returned by base::Bind may be
destroyed at the same time on different threads. Therefore, we have a race on
the circular linked list in linked_ptr.

If you really want to do this, we'd need shared_ptr or you'd have to wrap these
data structures a container class inheriting from RefCountedThreadSafe.

[Joao da Silva, 2011/09/02 17:35:20]

I'd really like to make sure there is always an owner of the memory. For the
current CL I'll let it leak in the (very unlikely) case of a policy update
during shutdown. I'll cc you later on a proposal for these cases.

+      ListValueToStringVector(pref_service_->GetList(prefs::kUrlBlacklist)));
+  linked_ptr<StringVector> allow(
+      ListValueToStringVector(pref_service_->GetList(prefs::kUrlWhitelist)));
+
+  // Go through the IO thread to grab a WeakPtr to |this|. This is safe from
+  // here, since this task will always execute before a potential deletion of
+  // ProfileIOData on IO.
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+      base::Bind(&URLBlacklistManager::UpdateOnIO, base::Unretained(this),
+                 block, allow));
+}
+
+void URLBlacklistManager::UpdateOnIO(linked_ptr<StringVector> block,
+                                     linked_ptr<StringVector> allow) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  linked_ptr<Blacklist> blacklist(new Blacklist);
+  // The Blacklist is built on the FILE thread. Once it's ready, it is passed
+  // to the URLBlacklistManager on IO.
+  BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE,
+      base::Bind(&BuildBlacklist, blacklist, block, allow),
+      base::Bind(&SetBlacklistOnIO, io_weak_ptr_factory_.GetWeakPtr(),
+                 blacklist));
+}
+
+void URLBlacklistManager::SetBlacklist(linked_ptr<Blacklist> blacklist) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  blacklist_ = blacklist;
+}
+
+bool URLBlacklistManager::IsURLBlocked(const GURL& url) const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  // TODO(joaodasilva): this is a work in progress. http://crbug.com/49612
+  return false;
+}
+
+// static
+void URLBlacklistManager::RegisterPrefs(PrefService* pref_service) {
+  pref_service->RegisterListPref(prefs::kUrlBlacklist,
+                                 PrefService::UNSYNCABLE_PREF);
+  pref_service->RegisterListPref(prefs::kUrlWhitelist,
+                                 PrefService::UNSYNCABLE_PREF);
+}
+
+}  // namespace policy