Use GURLs instead of patterns in SetContentSetting in notifications

chrome/browser/notifications/message_center_settings_controller.cc

 // Copyright (c) 2013 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/notifications/message_center_settings_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 332 matching lines @@
       if (iter != patterns_.end()) {
         pattern = iter->second;
       } else if (notifier.notifier_id.url.is_valid()) {
         pattern =
             ContentSettingsPattern::FromURLNoWildcard(notifier.notifier_id.url);
       } else {
         LOG(ERROR) << "Invalid url pattern: "
                    << notifier.notifier_id.url.spec();
       }
 
-      if (pattern.IsValid())
-        DesktopNotificationProfileUtil::ClearSetting(profile, pattern);
+      if (pattern.IsValid()) {
+        // Note that we don't use DesktopNotificationProfileUtil::ClearSetting()
+        // here because pattern might be from user manual input and not match
+        // the default one used by ClearSetting().
+        HostContentSettingsMapFactory::GetForProfile(profile)
+            ->SetContentSetting(pattern, ContentSettingsPattern::Wildcard(),
+                                CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+                                content_settings::ResourceIdentifier(),
+                                CONTENT_SETTING_DEFAULT);
+      }
     }
   } else {
     NotifierStateTrackerFactory::GetForProfile(profile)
         ->SetNotifierEnabled(notifier.notifier_id, enabled);
   }
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,
                     NotifierEnabledChanged(notifier.notifier_id, enabled));
 }
 
@@ skipping 190 matching lines @@
             weak_factory_.GetWeakPtr()));
   }
 #endif
 
   if (notify) {
     FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                       observers_,
                       NotifierGroupChanged());
   }
 }