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 0f0014f32ebc5ee6a8794c540226e26f596f4ac8..8a644cde29a3a36a7eaf3f3917995b7bd470c43f 100644
--- a/chrome/browser/managed_mode/managed_mode.cc
+++ b/chrome/browser/managed_mode/managed_mode.cc
@@ -75,24 +75,22 @@ class ManagedMode::URLFilterContext {
                                       base::Bind(&base::DoNothing)));
   }
 
-  void AddStringToManualWhitelist(const std::string& url) {
+  void AddURLPatternToManualWhitelist(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)));
+        base::Bind(&ManagedModeURLFilter::AddURLPatternToManualWhitelist,
+                   base::Unretained(&url_filter_),
+                   url,
+                   base::Bind(&base::DoNothing)));
   }
 
-  void AddStringToManualBlacklist(const std::string& url) {
+  void AddURLPatternToManualBlacklist(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)));
+        base::Bind(&ManagedModeURLFilter::AddURLPatternToManualBlacklist,
+                   base::Unretained(&url_filter_),
+                   url,
+                   base::Bind(&base::DoNothing)));
   }
 
   void ShutdownOnUIThread() {
@@ -263,16 +261,52 @@ void ManagedMode::GetCategoryNames(CategoryList* list) {
 
 // static
 scoped_ptr<base::ListValue> ManagedMode::GetWhitelist() {
-  // XXX Is this ok? GetList returns a const and we need non-const
-  return scoped_ptr<base::ListValue>(
-      GetInstance()->managed_profile_->GetPrefs()->GetList(
+  return GetInstance()->GetWhitelistImpl();
+}
+
+scoped_ptr<base::ListValue> ManagedMode::GetWhitelistImpl() {
+  return make_scoped_ptr(
+      managed_profile_->GetPrefs()->GetList(
           prefs::kManagedModeWhitelist)->DeepCopy()).Pass();

[Bernhard Bauer, 2012/11/26 16:06:30]

make_scoped_ptr() already returns a temporary, so you don't need Pass().

[Sergiu, 2012/11/27 15:37:34]

Done.

 }
 
 // static
-void ManagedMode::SetWhitelist(base::ListValue* whitelist) {
+bool ManagedMode::AddToManualWhitelist(const base::ListValue& whitelist) {
+    scoped_ptr<base::ListValue> pref_list(
+        GetInstance()->managed_profile_->GetPrefs()->GetList(

[Bernhard Bauer, 2012/11/26 16:06:30]

I'm not very happy about accessing members from a static method. Could you
delegate to a non-static Impl() method here?

[Sergiu, 2012/11/27 15:37:34]

Done.

+            prefs::kManagedModeWhitelist)->DeepCopy());

[Bernhard Bauer, 2012/11/26 16:06:30]

You could probably use a ScopedListPrefUpdate here instead.

[Sergiu, 2012/11/27 15:37:34]

Done, changed to a ListPrefUpdate, which seems to work.

+    bool added_last_url = true;
+    // Count as ListValues don't have a .back() member.
+    unsigned int position = 0;
+    for (ListValue::const_iterator it = whitelist.begin();
+         it != whitelist.end(); ++it) {
+      std::string url_pattern;
+      (*it)->GetAsString(&url_pattern);
+
+      if (!IsInManualWhitelist(url_pattern)) {
+        pref_list->Append((*it)->DeepCopy());
+        AddURLPatternToManualWhitelist(url_pattern);
+      } else if (position == whitelist.GetSize() - 1) {
+        added_last_url = false;
+      }
+
+      ++position;
+    }
+
+    // Save the updated user preference list.
     GetInstance()->managed_profile_->GetPrefs()->Set(
-        prefs::kManagedModeWhitelist, *whitelist);
+        prefs::kManagedModeWhitelist,
+        *pref_list);
+
+    return added_last_url;
+}
+
+// static
+bool ManagedMode::IsInManualWhitelist(const std::string& url_pattern) {
+  StringValue pattern(url_pattern);
+  const ListValue *list = GetInstance()->managed_profile_->GetPrefs()->GetList(

[Bernhard Bauer, 2012/11/26 16:06:30]

Asterisk comes directly after the type, and a space afterwards.

[Sergiu, 2012/11/27 15:37:34]

Done.

+      prefs::kManagedModeWhitelist);
+  return list->Find(pattern) != list->end();
 }
 
 // static
@@ -519,12 +553,18 @@ void ManagedMode::UpdateWhitelist() {
   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::AddURLPatternToManualWhitelist(
+    const std::string& url_pattern) {
+  GetInstance()->io_url_filter_context_->AddURLPatternToManualWhitelist(
+      url_pattern);
+  GetInstance()->ui_url_filter_context_->AddURLPatternToManualWhitelist(
+      url_pattern);
 }
 
-void ManagedMode::AddStringToManualBlacklist(const std::string& url) {
-  GetInstance()->io_url_filter_context_->AddStringToManualBlacklist(url);
-  GetInstance()->ui_url_filter_context_->AddStringToManualBlacklist(url);
+void ManagedMode::AddURLPatternToManualBlacklist(
+    const std::string& url_pattern) {
+  GetInstance()->io_url_filter_context_->AddURLPatternToManualBlacklist(
+      url_pattern);
+  GetInstance()->ui_url_filter_context_->AddURLPatternToManualBlacklist(
+      url_pattern);
 }