Merge 198705 "Fixes a typo: disabled_extension_ids_ should not b..."

chrome/browser/notifications/desktop_notification_service.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/notifications/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 593 matching lines @@
   // Do not touch |disabled_extension_ids_|. It will be updated at
   // OnDisabledExtensionIdsChanged() which will be called when the pref changes.
   ToggleListPrefItem(
       profile_->GetPrefs(),
       prefs::kMessageCenterDisabledSystemComponentIds,
       message_center::ToString(type),
       !enabled);
 }
 
 void DesktopNotificationService::OnDisabledSystemComponentIdsChanged() {
-  disabled_extension_ids_.clear();
+  disabled_system_component_ids_.clear();
   CopySetFromPrefToMemory(profile_->GetPrefs(),
                           prefs::kMessageCenterDisabledSystemComponentIds,
                           &disabled_system_component_ids_);
 }
 #endif
 
 WebKit::WebNotificationPresenter::Permission
     DesktopNotificationService::HasPermission(const GURL& origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   HostContentSettingsMap* host_content_settings_map =
       profile_->GetHostContentSettingsMap();
   ContentSetting setting = host_content_settings_map->GetContentSetting(
       origin,
       origin,
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
       NO_RESOURCE_IDENTIFIER);
 
   if (setting == CONTENT_SETTING_ALLOW)
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return WebKit::WebNotificationPresenter::PermissionDenied;
   if (setting == CONTENT_SETTING_ASK)
     return WebKit::WebNotificationPresenter::PermissionNotAllowed;
   NOTREACHED() << "Invalid notifications settings value: " << setting;
   return WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }