Remove Ordinals Setters and Getters from ExtensionService

chrome/browser/extensions/extension_sorting.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SORTING_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SORTING_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/common/string_ordinal.h"
 
 class ExtensionScopedPrefs;
+class ExtensionService;
 
 class ExtensionSorting {
  public:
   explicit ExtensionSorting(ExtensionScopedPrefs* extension_scoped_prefs,
                             PrefService* pref_service);
   ~ExtensionSorting();
 
+  // Set up the ExtensionService to inform of changes that require syncing.
+  void SetExtensionService(ExtensionService* extension_service);
+
   // Properly initialize ExtensionSorting internal values that require
   // |extension_ids|.
   void Initialize(const ExtensionPrefs::ExtensionIdSet& extension_ids);
 
   // Resolves any conflicts the might be created as a result of syncing that
   // results in two icons having the same page and app launch ordinal. After
   // this is called it is guaranteed that there are no collisions of NTP icons.
   void FixNTPOrdinalCollisions();
 
   // This ensures that the extension has valid ordinals, and if it doesn't then
@@ skipping 94 matching lines @@
   // Removes the mapping for |extension_id| with a page ordinal of
   // |page_ordinal| and a app launch ordinal of |app_launch_ordinal|. If there
   // is not matching map, nothing happens. This works with valid and invalid
   // StringOrdinals.
   void RemoveOrdinalMapping(const std::string& extension_id,
                             const StringOrdinal& page_ordinal,
                             const StringOrdinal& app_launch_ordinal);
 
   ExtensionScopedPrefs* extension_scoped_prefs_;  // Weak, owns this instance.
   PrefService* pref_service_;  // Weak.
+  ExtensionService* extension_service_;  // Weak.

[Aaron Boodman, 2012/03/14 18:54:28]

Instead of having a direct dependency on ExtensionService, consider making it a
dependency on ExtensionServiceInterface. This might allow you to move the unit
tests of ExtensionSorting out into their own file, which would be nice since
extension_service_unittest is so large.

[csharp, 2012/03/15 17:21:19]

Ok, I've changed the dependency. I looked at the tests related to the ordinals
that are in extension_service_unittest and they are testing ExtensionService
functionality, so I don't think they should be moved.

 
   // 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).
   // The StringOrdinal is the app launch ordinal and the string is the extension
   // id.
   typedef std::multimap<
       StringOrdinal, std::string, StringOrdinalLessThan> AppLaunchOrdinalMap;
   // The StringOrdinal is the page ordinal and the AppLaunchOrdinalMap is the
   // contents of that page.
   typedef std::map<
       StringOrdinal, AppLaunchOrdinalMap, StringOrdinalLessThan> PageOrdinalMap;
   PageOrdinalMap ntp_ordinal_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSorting);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SORTING_H_