Support manual (white|black)list, previewing and allowing after interstitial

chrome/browser/managed_mode/managed_mode.cc

Index: chrome/browser/managed_mode/managed_mode.cc
diff --git a/chrome/browser/managed_mode/managed_mode.cc b/chrome/browser/managed_mode/managed_mode.cc
index eacee6818079eb11e414c21ddbcf78253af94298..c39369a66c30693c0a10d3f1dfc954abf27f37f4 100644
--- a/chrome/browser/managed_mode/managed_mode.cc
+++ b/chrome/browser/managed_mode/managed_mode.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/managed_mode/managed_mode_site_list.h"
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
+#include "chrome/browser/policy/url_blacklist_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -61,6 +62,37 @@ class ManagedMode::URLFilterContext {
                                       base::Bind(&base::DoNothing)));
   }
 
+  void LoadManualLists(scoped_ptr<ListValue> whitelist,
+                       scoped_ptr<ListValue> blacklist) {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    task_runner_->PostTask(FROM_HERE,
+                           base::Bind(&ManagedModeURLFilter::SetManualLists,
+                                      base::Unretained(&url_filter_),
+                                      base::Passed(&whitelist),
+                                      base::Passed(&blacklist),
+                                      base::Bind(&base::DoNothing)));
+  }
+
+  void AddStringToManualWhitelist(const std::string& url) {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    task_runner_->PostTask(FROM_HERE,
+                           base::Bind(
+                             &ManagedModeURLFilter::AddStringToManualWhitelist,
+                             base::Unretained(&url_filter_),
+                             url,
+                             base::Bind(&base::DoNothing)));
+  }
+
+  void AddStringToManualBlacklist(const std::string& url) {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    task_runner_->PostTask(FROM_HERE,
+                           base::Bind(
+                             &ManagedModeURLFilter::AddStringToManualBlacklist,
+                             base::Unretained(&url_filter_),
+                             url,
+                             base::Bind(&base::DoNothing)));
+  }
+
   void ShutdownOnUIThread() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     bool result = task_runner_->DeleteSoon(FROM_HERE, this);
@@ -227,6 +259,26 @@ void ManagedMode::GetCategoryNames(CategoryList* list) {
   ManagedModeSiteList::GetCategoryNames(list);
 };
 
+// static
+scoped_ptr<base::ListValue> ManagedMode::GetWhitelist() {
+  // XXX Is this ok? GetList returns a const and we need non-const

[Bernhard Bauer, 2012/11/16 15:04:46]

Yes, it is (at least with this signature). We're passing ownership of the return
value, so it needs to be a copy.

+  return scoped_ptr<base::ListValue>(

[Bernhard Bauer, 2012/11/16 15:04:46]

You can use make_scoped_ptr() here.

[Sergiu, 2012/11/26 14:48:08]

Done.

+      GetInstance()->managed_profile_->GetPrefs()->GetList(

[Bernhard Bauer, 2012/11/16 15:04:46]

I would prefer to have public static Foo() methods that forward to private
non-static FooImpl() methods instead of accessing the members directly.

[Sergiu, 2012/11/26 14:48:08]

Done.

+          prefs::kManagedModeWhitelist)->DeepCopy()).Pass();
+}
+
+// static
+void ManagedMode::SetWhitelist(base::ListValue* whitelist) {
+    GetInstance()->managed_profile_->GetPrefs()->Set(
+        prefs::kManagedModeWhitelist, *whitelist);
+}
+
+// static
+scoped_ptr<base::ListValue> ManagedMode::GetBlacklist() {
+    return scoped_ptr<base::ListValue>(
+        GetInstance()->managed_profile_->GetPrefs()->GetList(
+            prefs::kManagedModeBlacklist)->DeepCopy()).Pass();
+}
 
 std::string ManagedMode::GetDebugPolicyProviderName() const {
   // Save the string space in official builds.
@@ -440,4 +492,16 @@ void ManagedMode::UpdateWhitelist() {
       ManagedModeSiteList::GetActiveSiteLists(extension_service));
   ui_url_filter_context_->LoadWhitelists(
       ManagedModeSiteList::GetActiveSiteLists(extension_service));
+  io_url_filter_context_->LoadManualLists(GetWhitelist(), GetBlacklist());
+  ui_url_filter_context_->LoadManualLists(GetWhitelist(), GetBlacklist());
+}
+
+void ManagedMode::AddStringToManualWhitelist(const std::string& url) {
+  GetInstance()->io_url_filter_context_->AddStringToManualWhitelist(url);
+  GetInstance()->ui_url_filter_context_->AddStringToManualWhitelist(url);
+}
+
+void ManagedMode::AddStringToManualBlacklist(const std::string& url) {
+  GetInstance()->io_url_filter_context_->AddStringToManualBlacklist(url);
+  GetInstance()->ui_url_filter_context_->AddStringToManualBlacklist(url);
 }