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

chrome/browser/extensions/api/font_settings/font_settings_api.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.
 
 // Font Settings Extension API implementation.
 
 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 140 matching lines @@
                                                         const char* event_name,
                                                         const char* key) {
   registrar_.Add(pref_name, this);
   pref_event_map_[pref_name] = std::make_pair(event_name, key);
 }
 
 void FontSettingsEventRouter::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  if (type != chrome::NOTIFICATION_PREF_CHANGED) {
-    NOTREACHED();
-    return;
-  }
+  DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED);
 
   PrefService* pref_service = content::Source<PrefService>(source).ptr();
   bool incognito = (pref_service != profile_->GetPrefs());
   // We're only observing pref changes on the regular profile.
   DCHECK(!incognito);
-  const std::string* pref_name =
-      content::Details<const std::string>(details).ptr();
+  const std::string& pref_name =
+      *content::Details<const std::string>(details).ptr();
 
-  PrefEventMap::iterator iter = pref_event_map_.find(*pref_name);
+  PrefEventMap::iterator iter = pref_event_map_.find(pref_name);
   if (iter != pref_event_map_.end()) {
     const std::string& event_name = iter->second.first;
     const std::string& key = iter->second.second;
-    OnFontPrefChanged(pref_service, *pref_name, event_name, key, incognito);
+    OnFontPrefChanged(pref_service, pref_name, event_name, key, incognito);
     return;
   }
 
   std::string generic_family;
   std::string script;
-  if (ParseFontNamePrefPath(*pref_name, &generic_family, &script)) {
-    OnFontNamePrefChanged(pref_service, *pref_name, generic_family, script,
+  if (ParseFontNamePrefPath(pref_name, &generic_family, &script)) {
+    OnFontNamePrefChanged(pref_service, pref_name, generic_family, script,
                           incognito);
     return;
   }
 
   NOTREACHED();
 }
 
 void FontSettingsEventRouter::OnFontNamePrefChanged(
     PrefService* pref_service,
     const std::string& pref_name,
@@ skipping 285 matching lines @@
 
 const char* SetMinimumFontSizeFunction::GetPrefName() {
   return prefs::kWebKitMinimumFontSize;
 }
 
 const char* SetMinimumFontSizeFunction::GetKey() {
   return kPixelSizeKey;
 }
 
 }  // namespace extensions