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

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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sync_data.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/apps_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_app_helper.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #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"
 #include "sync/api/string_ordinal.h"
 
 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::CopyNTPOrdinals;
 using apps_helper::DisableApp;
 using apps_helper::EnableApp;
 using apps_helper::FixNTPOrdinalCollisions;
@@ skipping 294 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.
   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());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   // 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());
 }
 
 // Adjust the launch type on the first client and sync. Both clients should
 // have the same launch type values for the CWS.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateLaunchType) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   // Change the launch type to window.
@@ skipping 90 matching lines @@
     content::WindowedNotificationObserver windowed_observer(
         extensions::NOTIFICATION_CRX_INSTALLER_DONE,
         base::Bind(&AllProfilesHaveSameAppsAsVerifier));
     windowed_observer.Wait();
   }
 }
 
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties