Remove Ordinals Setters and Getters from ExtensionService

chrome/browser/sync/test/integration/two_client_apps_sync_test.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 "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"
 #include "chrome/browser/sync/test/integration/sync_app_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::CopyNTPOrdinals;
 using apps_helper::DisableApp;
 using apps_helper::EnableApp;
@@ skipping 354 matching lines @@
 }
 
 // Adjust the CWS location within a page on the first client and sync. Adjust
 // which page the CWS appears on and sync. Both clients should have the same
 // page and app launch ordinal values for the CWS.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {
   ASSERT_TRUE(SetupSync());
   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());
 }
 
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties