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

chrome/browser/extensions/extension_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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 2573 matching lines @@
 
       process_map_.RemoveAllFromProcess(process->GetID());
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&ExtensionInfoMap::UnregisterAllExtensionsInProcess,
                      system_->info_map(),
                      process->GetID()));
       break;
     }
     case chrome::NOTIFICATION_PREF_CHANGED: {
-      std::string* pref_name = content::Details<std::string>(details).ptr();
-      if (*pref_name == prefs::kExtensionInstallAllowList ||
-          *pref_name == prefs::kExtensionInstallDenyList) {
-        IdentifyAlertableExtensions();
-        CheckManagementPolicy();
-      } else {
-        NOTREACHED() << "Unexpected preference name.";
-      }
+      const std::string& pref_name =
+          *content::Details<std::string>(details).ptr();
+      DCHECK(pref_name == prefs::kExtensionInstallAllowList ||
+             pref_name == prefs::kExtensionInstallDenyList);

[Yoyo Zhou, 2012/10/27 15:45:03]

You can still emit the NOTREACHED message from the DCHECK.

[Lei Zhang, 2012/10/30 00:01:45]

Done. I will also output |pref_name| so the error message is more useful.

+      IdentifyAlertableExtensions();
+      CheckManagementPolicy();
       break;
     }
     case chrome::NOTIFICATION_IMPORT_FINISHED: {
       InitAfterImport();
       break;
     }
 
     default:
       NOTREACHED() << "Unexpected notification type.";
   }
@@ skipping 222 matching lines @@
     // External extensions are initially disabled. We prompt the user before
     // enabling them.
     if (Extension::IsExternalLocation(extension->location()) &&
         !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) {
       return false;
     }
   }
 
   return true;
 }