Remove Ordinals Setters and Getters from ExtensionService

chrome/browser/extensions/extension_service_unittest.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_service_unittest.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 1990 matching lines @@
   ASSERT_TRUE(new_launch_ordinal.Equal(sorting->GetAppLaunchOrdinal(id)));
 }
 
 // Ensures that the CWS has properly initialized ordinals.
 TEST_F(ExtensionServiceTest, EnsureCWSOrdinalsInitialized) {
   InitializeEmptyExtensionService();
   service_->component_loader()->Add(IDR_WEBSTORE_MANIFEST,
                                     FilePath(FILE_PATH_LITERAL("web_store")));
   service_->Init();
 
-
   ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
   EXPECT_TRUE(
       sorting->GetPageOrdinal(extension_misc::kWebStoreAppId).IsValid());
   EXPECT_TRUE(
       sorting->GetAppLaunchOrdinal(extension_misc::kWebStoreAppId).IsValid());
 }
 
 TEST_F(ExtensionServiceTest, InstallAppsWithUnlimitedStorage) {
   InitializeEmptyExtensionService();
   InitializeRequestContext();
@@ skipping 2090 matching lines @@
 
   StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal();
   {
     SyncDataList list = service_->GetAllSyncData(syncable::APPS);
     ASSERT_EQ(list.size(), 1U);
     ExtensionSyncData data(list[0]);
     EXPECT_TRUE(initial_ordinal.Equal(data.app_launch_ordinal()));
     EXPECT_TRUE(initial_ordinal.Equal(data.page_ordinal()));
   }
 
-  service_->SetAppLaunchOrdinal(app->id(), initial_ordinal.CreateAfter());
+  ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
+  sorting->SetAppLaunchOrdinal(app->id(), initial_ordinal.CreateAfter());
   {
     SyncDataList list = service_->GetAllSyncData(syncable::APPS);
     ASSERT_EQ(list.size(), 1U);
     ExtensionSyncData data(list[0]);
     EXPECT_TRUE(initial_ordinal.LessThan(data.app_launch_ordinal()));
     EXPECT_TRUE(initial_ordinal.Equal(data.page_ordinal()));
   }
 
-  service_->SetPageOrdinal(app->id(), initial_ordinal.CreateAfter());
+  sorting->SetPageOrdinal(app->id(), initial_ordinal.CreateAfter());
   {
     SyncDataList list = service_->GetAllSyncData(syncable::APPS);
     ASSERT_EQ(list.size(), 1U);
     ExtensionSyncData data(list[0]);
     EXPECT_TRUE(initial_ordinal.LessThan(data.app_launch_ordinal()));
     EXPECT_TRUE(initial_ordinal.LessThan(data.page_ordinal()));
   }
 }
 
 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) {
@@ skipping 715 matching lines @@
   provider->UpdateOrAddExtension(hosted_app, "1.0.0.0",
                                  data_dir_.AppendASCII("hosted_app.crx"));
 
   service_->CheckForExternalUpdates();
   loop_.RunAllPending();
 
   ASSERT_TRUE(service_->PopulateExtensionGlobalError(
       extension_global_error.get()));
   ASSERT_EQ(1u, extension_global_error->get_external_extension_ids()->size());
 }