Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/chrome_app_sorting.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_APP_SORTING_H_
 #define CHROME_BROWSER_EXTENSIONS_CHROME_APP_SORTING_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/extension.h"
 #include "sync/api/string_ordinal.h"
 
 class PrefService;
 
 namespace extensions {
 
 class ExtensionScopedPrefs;
 
 class ChromeAppSorting : public AppSorting {
  public:
   explicit ChromeAppSorting(content::BrowserContext* browser_context);
   ~ChromeAppSorting() override;
 
   // AppSorting implementation:
-  void SetExtensionScopedPrefs(ExtensionScopedPrefs* prefs) override;
-  void CheckExtensionScopedPrefs() const override;
   void Initialize(const extensions::ExtensionIdList& extension_ids) override;

[not at google - send to devlin, 2015/07/29 18:22:03]

I'd like to take this off the public interface, and have ChromeAppSorting handle
this itself.

For example, you could the strategy that ExtensionSystem::ready() uses and add
an ExtensionPrefs::ready().

[Marc Treib, 2015/07/30 14:04:12]

Agreed. I'll do this when the remaining stuff is sorted out.

   void FixNTPOrdinalCollisions() override;
   void EnsureValidOrdinals(
       const std::string& extension_id,
       const syncer::StringOrdinal& suggested_page) override;
   void OnExtensionMoved(const std::string& moved_extension_id,
                         const std::string& predecessor_extension_id,
                         const std::string& successor_extension_id) override;
   syncer::StringOrdinal GetAppLaunchOrdinal(
       const std::string& extension_id) const override;
   void SetAppLaunchOrdinal(
@@ skipping 102 matching lines @@
   // Returns |app_launch_ordinal| if it has no collision in the page specified
   // by |page_ordinal|. Otherwise, returns an ordinal after |app_launch_ordinal|
   // that has no conflict.
   syncer::StringOrdinal ResolveCollision(
       const syncer::StringOrdinal& page_ordinal,
       const syncer::StringOrdinal& app_launch_ordinal) const;
 
   // Returns the number of items in |m| visible on the new tab page.
   size_t CountItemsVisibleOnNtp(const AppLaunchOrdinalMap& m) const;
 
-  ExtensionScopedPrefs* extension_scoped_prefs_;  // Weak, owns this instance.
   content::BrowserContext* browser_context_;
 
   // A map of all the StringOrdinal page ordinals mapping to the collections of
   // app launch ordinals that exist on that page. This is used for mapping
   // StringOrdinals to their Integer equivalent as well as quick lookup of the
   // any collision of on the NTP (icons with the same page and same app launch
   // ordinals). The possiblity of collisions means that a multimap must be used
   // (although the collisions must all be resolved once all the syncing is
   // done).
   PageOrdinalMap ntp_ordinal_map_;
 
   // Defines the default ordinals.
   AppOrdinalsMap default_ordinals_;
 
   // Used to construct the default ordinals once when needed instead of on
   // construction when the app order may not have been determined.
   bool default_ordinals_created_;
 
   // The set of extensions that don't appear in the new tab page.
   std::set<std::string> ntp_hidden_extensions_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeAppSorting);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CHROME_APP_SORTING_H_