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

chrome/browser/content_settings/cookie_settings.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/content_settings/cookie_settings.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 141 matching lines @@
     const ContentSettingsPattern& secondary_pattern) {
   host_content_settings_map_->SetContentSetting(
       primary_pattern, secondary_pattern, CONTENT_SETTINGS_TYPE_COOKIES, "",
       CONTENT_SETTING_DEFAULT);
 }
 
 void CookieSettings::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED);
+  DCHECK_EQ(*content::Details<std::string>(details).ptr(),
+            std::string(prefs::kBlockThirdPartyCookies));
 
-  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-    PrefService* prefs = content::Source<PrefService>(source).ptr();
-    std::string* name = content::Details<std::string>(details).ptr();
-    if (*name == prefs::kBlockThirdPartyCookies) {
-      base::AutoLock auto_lock(lock_);
-      block_third_party_cookies_ = prefs->GetBoolean(
-          prefs::kBlockThirdPartyCookies);
-    } else {
-      NOTREACHED() << "Unexpected preference observed";
-      return;
-    }
-  } else {
-    NOTREACHED() << "Unexpected notification";
+  PrefService* prefs = content::Source<PrefService>(source).ptr();
+  {
+    base::AutoLock auto_lock(lock_);
+    block_third_party_cookies_ = prefs->GetBoolean(
+        prefs::kBlockThirdPartyCookies);
   }
 }
 
 void CookieSettings::ShutdownOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   pref_change_registrar_.RemoveAll();
 }
 
 ContentSetting CookieSettings::GetCookieSetting(
     const GURL& url,
@@ skipping 37 matching lines @@
   DCHECK(value.get());
   return content_settings::ValueToContentSetting(value.get());
 }
 
 CookieSettings::~CookieSettings() {}
 
 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
   base::AutoLock auto_lock(lock_);
   return block_third_party_cookies_;
 }