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

chrome/browser/apps/ephemeral_app_browsertest.cc

 // Copyright 2014 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/apps/ephemeral_app_browsertest.h"
 
 #include <vector>
 
 #include "apps/app_restore_service.h"
 #include "apps/saved_files_service.h"
@@ skipping 27 matching lines @@
 #include "extensions/common/extension.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 #include "sync/api/fake_sync_change_processor.h"
 #include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notifier_settings.h"
 
+using extensions::AppSorting;
 using extensions::Event;
 using extensions::EventRouter;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionRegistryObserver;
 using extensions::ExtensionSyncData;
 using extensions::ExtensionSystem;
 using extensions::Manifest;
 using extensions::ResultCatcher;
@@ skipping 311 matching lines @@
 
   // Verify properties of ephemeral apps.
   void VerifyEphemeralApp(const std::string& app_id) {
     EXPECT_TRUE(extensions::util::IsEphemeralApp(app_id, profile()));
 
     // Ephemeral apps should not be synced.
     scoped_ptr<ExtensionSyncData> sync_change = GetLastSyncChangeForApp(app_id);
     EXPECT_FALSE(sync_change.get());
 
     // Ephemeral apps should not be assigned ordinals.
-    extensions::AppSorting* app_sorting =
-        ExtensionPrefs::Get(profile())->app_sorting();
+    AppSorting* app_sorting = ExtensionSystem::Get(profile())->app_sorting();
     EXPECT_FALSE(app_sorting->GetAppLaunchOrdinal(app_id).IsValid());
     EXPECT_FALSE(app_sorting->GetPageOrdinal(app_id).IsValid());
   }
 
   // Verify that after ephemeral apps stop running, they reside in extension
   // system in a disabled and unloaded state.
   void VerifyInactiveEphemeralApp(const std::string& app_id) {
     EXPECT_TRUE(
         ExtensionRegistry::Get(profile())->disabled_extensions().Contains(
             app_id));
@@ skipping 15 matching lines @@
 
     // The app should not be ephemeral.
     ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
     ASSERT_TRUE(prefs);
     EXPECT_FALSE(prefs->IsEphemeralApp(app_id));
     EXPECT_EQ(0,
               prefs->GetDisableReasons(app_id) &
                   Extension::DISABLE_INACTIVE_EPHEMERAL_APP);
 
     // Check sort ordinals.
-    extensions::AppSorting* app_sorting = prefs->app_sorting();
+    AppSorting* app_sorting = ExtensionSystem::Get(profile())->app_sorting();
     EXPECT_TRUE(app_sorting->GetAppLaunchOrdinal(app_id).IsValid());
     EXPECT_TRUE(app_sorting->GetPageOrdinal(app_id).IsValid());
   }
 
   // Dispatch a fake alarm event to the app.
   void DispatchAlarmEvent(EventRouter* event_router,
                           const std::string& app_id) {
     alarms::Alarm dummy_alarm;
     dummy_alarm.name = "test_alarm";
 
@@ skipping 70 matching lines @@
 
     ExtensionSyncService::Get(profile())->ProcessSyncChanges(
         FROM_HERE,
         syncer::SyncChangeList(
             1, app_sync_data.GetSyncChange(syncer::SyncChange::ACTION_ADD)));
 
     // Verify the installation.
     VerifyPromotedApp(app_id, expected_set);
 
     // The sort ordinals from sync should not be overridden.
-    ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
-    extensions::AppSorting* app_sorting = prefs->app_sorting();
+    AppSorting* app_sorting = ExtensionSystem::Get(profile())->app_sorting();
     EXPECT_TRUE(
         app_sorting->GetAppLaunchOrdinal(app_id).Equals(kAppLaunchOrdinal));
     EXPECT_TRUE(app_sorting->GetPageOrdinal(app_id).Equals(kPageOrdinal));
   }
 
   void InitSyncService() {
     if (!kEnableSync)
       return;
 
     ExtensionSyncService* sync_service = ExtensionSyncService::Get(profile());
@@ skipping 513 matching lines @@
       base::Bind(&PowerSaveBlockerStub::Create, &power_settings));
 
   const Extension* app = InstallAndLaunchEphemeralApp(kPowerTestApp);
   ASSERT_TRUE(app);
   EXPECT_EQ(1, power_settings.keep_awake_count());
 
   CloseAppWaitForUnload(app->id());
 
   EXPECT_EQ(0, power_settings.keep_awake_count());
 }