app_sorting() calls should go via ExtensionSystem intsead of prefs.

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 b24a7dd9f7c00b9608b3f71b18020c47dcff059e..8fa681ec57a21e4635ef2e7c367680d797dcc040 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
@@ -19,7 +19,6 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_sorting.h"
-#include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
@@ -334,14 +333,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {
 
   // Change the app launch ordinal.
   syncer::StringOrdinal cws_app_launch_ordinal =
-      extensions::ExtensionPrefs::Get(GetProfile(0))
+      extensions::ExtensionSystem::Get(GetProfile(0))
           ->app_sorting()
           ->GetAppLaunchOrdinal(extensions::kWebStoreAppId);
-  extensions::ExtensionPrefs::Get(GetProfile(0))
+  extensions::ExtensionSystem::Get(GetProfile(0))
       ->app_sorting()
       ->SetAppLaunchOrdinal(extensions::kWebStoreAppId,
                             cws_app_launch_ordinal.CreateAfter());
-  extensions::ExtensionPrefs::Get(verifier())
+  extensions::ExtensionSystem::Get(verifier())
       ->app_sorting()
       ->SetAppLaunchOrdinal(extensions::kWebStoreAppId,
                             cws_app_launch_ordinal.CreateAfter());
@@ -349,13 +348,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {
 
   // Change the page ordinal.
   syncer::StringOrdinal cws_page_ordinal =
-      extensions::ExtensionPrefs::Get(GetProfile(1))
+      extensions::ExtensionSystem::Get(GetProfile(1))
           ->app_sorting()
           ->GetPageOrdinal(extensions::kWebStoreAppId);
-  extensions::ExtensionPrefs::Get(GetProfile(1))->app_sorting()->SetPageOrdinal(
-      extensions::kWebStoreAppId, cws_page_ordinal.CreateAfter());
-  extensions::ExtensionPrefs::Get(verifier())->app_sorting()->SetPageOrdinal(
-      extensions::kWebStoreAppId, cws_page_ordinal.CreateAfter());
+  extensions::ExtensionSystem::Get(GetProfile(1))
+      ->app_sorting()
+      ->SetPageOrdinal(extensions::kWebStoreAppId,
+                       cws_page_ordinal.CreateAfter());
+  extensions::ExtensionSystem::Get(verifier())
+      ->app_sorting()
+      ->SetPageOrdinal(extensions::kWebStoreAppId,
+                       cws_page_ordinal.CreateAfter());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }