Cleanup: Simplify some extensions / content_settings Observer code by simply DCHECKING instead of u…

chrome/browser/content_settings/content_settings_pref_provider.cc

Index: chrome/browser/content_settings/content_settings_pref_provider.cc
===================================================================
--- chrome/browser/content_settings/content_settings_pref_provider.cc	(revision 164413)
+++ chrome/browser/content_settings/content_settings_pref_provider.cc	(working copy)
@@ -222,26 +222,20 @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED);
+  DCHECK_EQ(prefs_, content::Source<PrefService>(source).ptr());
+  DCHECK_EQ(*content::Details<std::string>(details).ptr(),
+            std::string(prefs::kContentSettingsPatternPairs));
 
-  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-    DCHECK_EQ(prefs_, content::Source<PrefService>(source).ptr());
-    if (updating_preferences_)
-      return;
+  if (updating_preferences_)
+    return;
 
-    std::string* name = content::Details<std::string>(details).ptr();
-    if (*name != prefs::kContentSettingsPatternPairs) {
-      NOTREACHED() << "Unexpected preference observed";
-      return;
-    }
-    ReadContentSettingsFromPref(true);
+  ReadContentSettingsFromPref(true);
 
-    NotifyObservers(ContentSettingsPattern(),
-                    ContentSettingsPattern(),
-                    CONTENT_SETTINGS_TYPE_DEFAULT,
-                    std::string());
-  } else {
-    NOTREACHED() << "Unexpected notification";
-  }
+  NotifyObservers(ContentSettingsPattern(),
+                  ContentSettingsPattern(),
+                  CONTENT_SETTINGS_TYPE_DEFAULT,
+                  std::string());
 }
 
 PrefProvider::~PrefProvider() {