Separate the NTP app ordering from the app list app ordering

chrome/browser/ui/app_list/apps_model_builder_unittest.cc

Index: chrome/browser/ui/app_list/apps_model_builder_unittest.cc
diff --git a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc
index c1554e55e3d068b8a01cd93cabeab703bd56832a..cb272c0964fb4f74fb4efa00fff7074fe908f065 100644
--- a/chrome/browser/ui/app_list/apps_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/apps_model_builder_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
-#include "chrome/browser/extensions/extension_sorting.h"
+#include "chrome/browser/ui/app_list/app_list_extension_sorting.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
@@ -190,21 +190,23 @@ TEST_F(AppsModelBuilderTest, OrdinalPrefsChange) {
   AppsModelBuilder builder(profile_.get(), model.get(), NULL);
   builder.Build();
 
-  ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
+  AppListExtensionSorting* ordering =
+      service_->extension_prefs()->app_list_extension_sorting();
 
-  syncer::StringOrdinal package_app_page =
-      sorting->GetPageOrdinal(kPackagedApp1Id);
-  sorting->SetPageOrdinal(kHostedAppId, package_app_page.CreateBefore());
+  syncer::StringOrdinal app1_ordinal =
+      ordering->GetAppListOrdinalFromPrefs(kPackagedApp1Id);
+  syncer::StringOrdinal app2_ordinal =
+      ordering->GetAppListOrdinalFromPrefs(kPackagedApp2Id);
+
+  ordering->UpdateAppListOrdinalFromSync(
+      kHostedAppId,
+      app1_ordinal.CreateBefore());
   EXPECT_EQ(std::string("Hosted App,Packaged App 1,Packaged App 2"),
             GetModelContent(model.get()));
 
-  syncer::StringOrdinal app1_ordinal =
-      sorting->GetAppLaunchOrdinal(kPackagedApp1Id);
-  syncer::StringOrdinal app2_ordinal =
-      sorting->GetAppLaunchOrdinal(kPackagedApp2Id);
-  sorting->SetPageOrdinal(kHostedAppId, package_app_page);
-  sorting->SetAppLaunchOrdinal(kHostedAppId,
-                               app1_ordinal.CreateBetween(app2_ordinal));
+  ordering->UpdateAppListOrdinalFromSync(
+      kHostedAppId,
+      app1_ordinal.CreateBetween(app2_ordinal));
   EXPECT_EQ(std::string("Packaged App 1,Hosted App,Packaged App 2"),
             GetModelContent(model.get()));
 }
@@ -215,33 +217,33 @@ TEST_F(AppsModelBuilderTest, OnExtensionMoved) {
   AppsModelBuilder builder(profile_.get(), model.get(), NULL);
   builder.Build();
 
-  ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
-  sorting->SetPageOrdinal(kHostedAppId,
-                          sorting->GetPageOrdinal(kPackagedApp1Id));
+  AppListExtensionSorting* ordering =
+      service_->extension_prefs()->app_list_extension_sorting();
 
-  service_->OnExtensionMoved(kHostedAppId, kPackagedApp1Id, kPackagedApp2Id);
+  ordering->OnExtensionMoved(kHostedAppId, kPackagedApp1Id, kPackagedApp2Id);
   EXPECT_EQ(std::string("Packaged App 1,Hosted App,Packaged App 2"),
             GetModelContent(model.get()));
 
-  service_->OnExtensionMoved(kHostedAppId, kPackagedApp2Id, std::string());
+  ordering->OnExtensionMoved(kHostedAppId, kPackagedApp2Id, std::string());
   EXPECT_EQ(std::string("Packaged App 1,Packaged App 2,Hosted App"),
             GetModelContent(model.get()));
 
-  service_->OnExtensionMoved(kHostedAppId, std::string(), kPackagedApp1Id);
+  ordering->OnExtensionMoved(kHostedAppId, std::string(), kPackagedApp1Id);
   EXPECT_EQ(std::string("Hosted App,Packaged App 1,Packaged App 2"),
             GetModelContent(model.get()));
 }
 
 TEST_F(AppsModelBuilderTest, InvalidOrdinal) {
   // Creates a no-ordinal case.
-  ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
-  sorting->ClearOrdinals(kPackagedApp1Id);
+  AppListExtensionSorting* ordering =
+      service_->extension_prefs()->app_list_extension_sorting();
+  ordering->Erase(kPackagedApp1Id);
 
   // Creates an corrupted ordinal case.
   ExtensionScopedPrefs* scoped_prefs = service_->extension_prefs();
   scoped_prefs->UpdateExtensionPref(
       kHostedAppId,
-      "page_ordinal",
+      "app_list_ordinal",
       base::Value::CreateStringValue("a corrupted ordinal"));
 
   scoped_ptr<app_list::AppListModel::Apps> model(
@@ -257,19 +259,16 @@ TEST_F(AppsModelBuilderTest, OrdinalConfilicts) {
   syncer::StringOrdinal conflict_ordinal =
       syncer::StringOrdinal::CreateInitialOrdinal();
 
-  ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
-  sorting->SetPageOrdinal(kHostedAppId, conflict_ordinal);
-  sorting->SetAppLaunchOrdinal(kHostedAppId, conflict_ordinal);
-
-  sorting->SetPageOrdinal(kPackagedApp1Id, conflict_ordinal);
-  sorting->SetAppLaunchOrdinal(kPackagedApp1Id, conflict_ordinal);
-
-  sorting->SetPageOrdinal(kPackagedApp2Id, conflict_ordinal);
-  sorting->SetAppLaunchOrdinal(kPackagedApp2Id, conflict_ordinal);
+  AppListExtensionSorting* ordering =
+      service_->extension_prefs()->app_list_extension_sorting();
+  ordering->UpdateAppListOrdinalFromSync(kHostedAppId, conflict_ordinal);
+  ordering->UpdateAppListOrdinalFromSync(kPackagedApp1Id, conflict_ordinal);
+  ordering->UpdateAppListOrdinalFromSync(kPackagedApp2Id, conflict_ordinal);
 
   scoped_ptr<app_list::AppListModel::Apps> model(
       new app_list::AppListModel::Apps);
   AppsModelBuilder builder(profile_.get(), model.get(), NULL);
+  // This fixes the collisions.
   builder.Build();
 
   // By default, conflicted items are sorted by their app ids.
@@ -277,7 +276,7 @@ TEST_F(AppsModelBuilderTest, OrdinalConfilicts) {
             GetModelContent(model.get()));
 
   // Move hosted app between app1 and app2 and it should not crash.
-  service_->OnExtensionMoved(kHostedAppId, kPackagedApp1Id, kPackagedApp2Id);
+  ordering->OnExtensionMoved(kHostedAppId, kPackagedApp1Id, kPackagedApp2Id);
   EXPECT_EQ(std::string("Packaged App 1,Hosted App,Packaged App 2"),
             GetModelContent(model.get()));
 }