Remove Ordinals Setters and Getters from ExtensionService

chrome/browser/sync/test/integration/sync_app_helper.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/sync/test/integration/sync_app_helper.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/test/integration/extensions_helper.h"
@@ skipping 25 matching lines @@
 
 bool AppState::Equals(const AppState& other) const {
   return app_launch_ordinal.Equal(other.app_launch_ordinal) &&
       page_ordinal.Equal(other.page_ordinal);
 }
 
 // Load all the app specific values for |id| into |app_state|.
 void LoadApp(ExtensionService* extension_service,
              const std::string& id,
              AppState* app_state) {
-  app_state->app_launch_ordinal = extension_service->GetAppLaunchOrdinal(id);
-  app_state->page_ordinal = extension_service->GetPageOrdinal(id);
+  app_state->app_launch_ordinal = extension_service->extension_prefs()->
+      extension_sorting()->GetAppLaunchOrdinal(id);
+  app_state->page_ordinal = extension_service->extension_prefs()->
+      extension_sorting()->GetPageOrdinal(id);
 }
 
 // Returns a map from |profile|'s installed extensions to their state.
 AppStateMap GetAppStates(Profile* profile) {
   AppStateMap app_state_map;
 
   ExtensionService* extension_service = profile->GetExtensionService();
 
   scoped_ptr<const ExtensionSet> extensions(
       extension_service->GenerateInstalledExtensionsSet());
@@ skipping 74 matching lines @@
     }
     ++it1;
     ++it2;
   }
 
   return true;
 }
 
 StringOrdinal SyncAppHelper::GetPageOrdinalForApp(Profile* profile,
                                                   const std::string& name) {
-  return profile->GetExtensionService()->GetPageOrdinal(
-      SyncExtensionHelper::NameToId(name));
+  return profile->GetExtensionService()->extension_prefs()->
+      extension_sorting()->GetPageOrdinal(SyncExtensionHelper::NameToId(name));
 }
 
 void SyncAppHelper::SetPageOrdinalForApp(Profile* profile,
                                          const std::string& name,
                                          const StringOrdinal& page_ordinal) {
-  profile->GetExtensionService()->SetPageOrdinal(
-      SyncExtensionHelper::NameToId(name), page_ordinal);
+  profile->GetExtensionService()->extension_prefs()->extension_sorting()->
+      SetPageOrdinal(SyncExtensionHelper::NameToId(name), page_ordinal);
 }
 
 StringOrdinal SyncAppHelper::GetAppLaunchOrdinalForApp(
     Profile* profile,
     const std::string& name) {
-  return profile->GetExtensionService()->GetAppLaunchOrdinal(
-      SyncExtensionHelper::NameToId(name));
+  return profile->GetExtensionService()->extension_prefs()->
+      extension_sorting()->GetAppLaunchOrdinal(
+          SyncExtensionHelper::NameToId(name));
 }
 
 void SyncAppHelper::SetAppLaunchOrdinalForApp(
     Profile* profile,
     const std::string& name,
     const StringOrdinal& app_launch_ordinal) {
-  profile->GetExtensionService()->SetAppLaunchOrdinal(
-      SyncExtensionHelper::NameToId(name),
-      app_launch_ordinal);
+  profile->GetExtensionService()->extension_prefs()->extension_sorting()->
+      SetAppLaunchOrdinal(SyncExtensionHelper::NameToId(name),
+                          app_launch_ordinal);
 }
 
 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
-  profile->GetExtensionService()->extension_prefs()->
-      extension_sorting()->FixNTPOrdinalCollisions();
+  profile->GetExtensionService()->extension_prefs()->extension_sorting()->
+      FixNTPOrdinalCollisions();
 }
 
 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
 
 SyncAppHelper::~SyncAppHelper() {}