Merge 130040 - Fix Crash in ExtensionSorting::SyncIfNeeded

chrome/browser/extensions/extension_sorting.cc

Index: chrome/browser/extensions/extension_sorting.cc
===================================================================
--- chrome/browser/extensions/extension_sorting.cc	(revision 130242)
+++ chrome/browser/extensions/extension_sorting.cc	(working copy)
@@ -505,7 +505,11 @@
         extension_service_->GetInstalledExtension(extension_id);
 
     if (ext) {
-      CHECK(ext->is_app());
+      // It is possible for old extension to have ordinal values, but they
+      // shouldn't so we clear them.
+      if (!ext->is_app())
+        ClearOrdinals(extension_id);
+
       extension_service_->SyncExtensionChangeIfNeeded(*ext);
     }
   }