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

chrome/browser/managed_mode/managed_mode.cc

 // Copyright (c) 2012 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/managed_mode/managed_mode.h"
 
 #include "base/command_line.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 57 matching lines @@
                        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) {
+  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() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     bool result = task_runner_->DeleteSoon(FROM_HERE, this);
     DCHECK(result);
   }
 
  private:
   ManagedModeURLFilter url_filter_;
@@ skipping 150 matching lines @@
   return (*sites.begin())->category_id;
 }
 
 // static
 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
-  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
 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.
 #ifdef NDEBUG
   NOTREACHED();
@@ skipping 223 matching lines @@
   ui_url_filter_context_->SetDefaultFilteringBehavior(behavior);
 }
 
 void ManagedMode::UpdateWhitelist() {
   io_url_filter_context_->LoadWhitelists(GetActiveSiteLists());
   ui_url_filter_context_->LoadWhitelists(GetActiveSiteLists());
   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::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);
 }