Remove Ordinals Setters and Getters from ExtensionService

chrome/browser/sync/test/integration/two_client_apps_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
index b87256c2c2b85cf54c6aa34aeca2ad5060245662..d4313b9cdb34a397656a95a689b390e7f3362263 100644
--- a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
@@ -5,6 +5,7 @@
 #include "base/basictypes.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/apps_helper.h"
@@ -379,24 +380,28 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   // Change the app launch ordinal.
-  StringOrdinal cws_app_launch_ordinal =
-      GetProfile(0)->GetExtensionService()->GetAppLaunchOrdinal(
+  StringOrdinal cws_app_launch_ordinal = GetProfile(0)->GetExtensionService()->
+      extension_prefs()->extension_sorting()->GetAppLaunchOrdinal(
           extension_misc::kWebStoreAppId);
-  GetProfile(0)->GetExtensionService()->SetAppLaunchOrdinal(
-      extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
-  verifier()->GetExtensionService()->SetAppLaunchOrdinal(
-      extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
+  GetProfile(0)->GetExtensionService()->extension_prefs()->extension_sorting()->
+      SetAppLaunchOrdinal(
+          extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
+  verifier()->GetExtensionService()->extension_prefs()->extension_sorting()->
+      SetAppLaunchOrdinal(
+          extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   // Change the page ordinal.
-  StringOrdinal cws_page_ordinal =
-      GetProfile(1)->GetExtensionService()->GetPageOrdinal(
+  StringOrdinal cws_page_ordinal = GetProfile(1)->GetExtensionService()->
+      extension_prefs()->extension_sorting()->GetPageOrdinal(
           extension_misc::kWebStoreAppId);
-  GetProfile(1)->GetExtensionService()->SetPageOrdinal(
-      extension_misc::kWebStoreAppId, cws_page_ordinal.CreateAfter());
-  verifier()->GetExtensionService()->SetPageOrdinal(
-      extension_misc::kWebStoreAppId, cws_page_ordinal.CreateAfter());
+  GetProfile(1)->GetExtensionService()->extension_prefs()->
+      extension_sorting()->SetPageOrdinal(extension_misc::kWebStoreAppId,
+                                          cws_page_ordinal.CreateAfter());
+  verifier()->GetExtensionService()->extension_prefs()->
+      extension_sorting()->SetPageOrdinal(extension_misc::kWebStoreAppId,
+                                          cws_page_ordinal.CreateAfter());
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }