Keep the obtained url patterns for notification settings.

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 "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/app_icon_loader_impl.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_service.h"
@@ skipping 43 matching lines @@
         UTF8ToUTF16(extension->name()),
         notification_service->IsExtensionEnabled(extension->id())));
     app_icon_loader_->FetchImage(extension->id());
   }
 
   ContentSettingsForOneType settings;
   notification_service->GetNotificationsSettings(&settings);
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
   favicon_tracker_.reset(new CancelableTaskTracker());
+  patterns_.clear();
   for (ContentSettingsForOneType::const_iterator iter = settings.begin();
        iter != settings.end(); ++iter) {
     if (iter->primary_pattern == ContentSettingsPattern::Wildcard() &&
         iter->secondary_pattern == ContentSettingsPattern::Wildcard() &&
         iter->source != "preference") {
       continue;
     }
 
     std::string url_pattern = iter->primary_pattern.ToString();
+    string16 name = UTF8ToUTF16(url_pattern);
     GURL url(url_pattern);
     notifiers->push_back(new message_center::Notifier(
         url,
-        UTF8ToUTF16(url_pattern),
+        name,
         notification_service->GetContentSetting(url) == CONTENT_SETTING_ALLOW));
+    patterns_[name] = iter->primary_pattern;
     FaviconService::FaviconForURLParams favicon_params(
         profile, url, history::FAVICON | history::TOUCH_ICON,
         message_center::kSettingsIconSize);
     // Note that favicon service obtains the favicon from history. This means
     // that it will fail to obtain the image if there are no history data for
     // that URL.
     favicon_service->GetFaviconImageForURL(
         favicon_params,
         base::Bind(&MessageCenterSettingsController::OnFaviconLoaded,
                    base::Unretained(this), url),
@@ skipping 23 matching lines @@
           (!enabled && default_setting == CONTENT_SETTING_ALLOW)) {
         if (notifier.url.is_valid()) {
           if (enabled)
             notification_service->GrantPermission(notifier.url);
           else
             notification_service->DenyPermission(notifier.url);
         } else {
           LOG(ERROR) << "Invalid url pattern: " << notifier.url.spec();
         }
       } else {
-        ContentSettingsPattern pattern =
-            ContentSettingsPattern::FromURL(notifier.url);
-        if (pattern.IsValid())
-          notification_service->ClearSetting(pattern);
-        else
+        std::map<string16, ContentSettingsPattern>::const_iterator iter =
+            patterns_.find(notifier.name);
+        if (iter != patterns_.end()) {
+          notification_service->ClearSetting(iter->second);
+        } else {
           LOG(ERROR) << "Invalid url pattern: " << notifier.url.spec();
+        }
       }
       break;
     }
   }
 }
 
 void MessageCenterSettingsController::OnNotifierSettingsClosing() {
   delegate_ = NULL;
   DCHECK(favicon_tracker_.get());
   favicon_tracker_->TryCancelAll();
+  patterns_.clear();
 }
 
 void MessageCenterSettingsController::OnFaviconLoaded(
     const GURL& url,
     const history::FaviconImageResult& favicon_result) {
   if (!delegate_)
     return;
   delegate_->UpdateFavicon(url, favicon_result.image);
 }
 
 
 void MessageCenterSettingsController::SetAppImage(const std::string& id,
                                                   const gfx::ImageSkia& image) {
   if (!delegate_)
     return;
   delegate_->UpdateIconImage(id, gfx::Image(image) );
 }