Merge 120123 - Fix crash in ExtensionService::InitializePermissions().

chrome/browser/extensions/permissions_updater.cc

Index: chrome/browser/extensions/permissions_updater.cc
===================================================================
--- chrome/browser/extensions/permissions_updater.cc	(revision 120126)
+++ chrome/browser/extensions/permissions_updater.cc	(working copy)
@@ -74,9 +74,10 @@
 void PermissionsUpdater::GrantActivePermissions(const Extension* extension) {
   CHECK(extension);
 
-  // We only maintain the granted permissions prefs for extensions that can't
-  // silently increase their permissions.
-  if (extension->CanSilentlyIncreasePermissions())
+  // We only maintain the granted permissions prefs for INTERNAL and LOAD
+  // extensions.
+  if (extension->location() != Extension::LOAD &&
+      extension->location() != Extension::INTERNAL)
     return;
 
   GetExtensionPrefs()->AddGrantedPermissions(