Merge 130040 - Fix Crash in ExtensionSorting::SyncIfNeeded

chrome/browser/extensions/extension_sorting.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_sorting.h"
 
 #include "chrome/browser/extensions/extension_scoped_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 487 matching lines @@
     }
   }
 }
 
 void ExtensionSorting::SyncIfNeeded(const std::string& extension_id) {
   if (extension_service_) {
     const Extension* ext =
         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);
     }
   }
 }