Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

extensions/browser/extension_prefs.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 "extensions/browser/extension_prefs.h"
 
 #include <iterator>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 178 matching lines @@
 // A boolean preference that indicates whether the extension should not be
 // synced. Default value is false.
 const char kPrefDoNotSync[] = "do_not_sync";
 
 const char kCorruptedDisableCount[] = "extensions.corrupted_disable_count";
 
 // A boolean preference that indicates whether the extension has local changes
 // that need to be synced. Default value is false.
 const char kPrefNeedsSync[] = "needs_sync";
 
+ExtensionPrefs* g_instance_for_testing = nullptr;
+
 // Provider of write access to a dictionary storing extension prefs.
 class ScopedExtensionPrefUpdate : public DictionaryPrefUpdate {
  public:
   ScopedExtensionPrefUpdate(PrefService* service,
                             const std::string& extension_id) :
     DictionaryPrefUpdate(service, pref_names::kExtensions),
     extension_id_(extension_id) {}
 
   ~ScopedExtensionPrefUpdate() override {}
 
@@ skipping 125 matching lines @@
 
 //
 // ExtensionPrefs
 //
 
 // static
 ExtensionPrefs* ExtensionPrefs::Create(
     PrefService* prefs,
     const base::FilePath& root_dir,
     ExtensionPrefValueMap* extension_pref_value_map,
-    scoped_ptr<AppSorting> app_sorting,
     bool extensions_disabled,
     const std::vector<ExtensionPrefsObserver*>& early_observers) {
   return ExtensionPrefs::Create(prefs,
                                 root_dir,
                                 extension_pref_value_map,
-                                app_sorting.Pass(),
                                 extensions_disabled,
                                 early_observers,
                                 make_scoped_ptr(new TimeProvider()));
 }
 
 // static
 ExtensionPrefs* ExtensionPrefs::Create(
     PrefService* pref_service,
     const base::FilePath& root_dir,
     ExtensionPrefValueMap* extension_pref_value_map,
-    scoped_ptr<AppSorting> app_sorting,
     bool extensions_disabled,
     const std::vector<ExtensionPrefsObserver*>& early_observers,
     scoped_ptr<TimeProvider> time_provider) {
   return new ExtensionPrefs(pref_service,
                             root_dir,
                             extension_pref_value_map,
-                            app_sorting.Pass(),
                             time_provider.Pass(),
                             extensions_disabled,
                             early_observers);
 }
 
 ExtensionPrefs::~ExtensionPrefs() {
 }
 
 // static
 ExtensionPrefs* ExtensionPrefs::Get(content::BrowserContext* context) {
+  if (g_instance_for_testing)
+    return g_instance_for_testing;

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

This is super-hacky. We should really go through the ExtensionPrefsFactory,
which already has a SetInstanceForTesting method, but that doesn't work without
a BrowserContext :(

   return ExtensionPrefsFactory::GetInstance()->GetForBrowserContext(context);
 }
 
+// static
+void ExtensionPrefs::SetInstanceForTesting(ExtensionPrefs* prefs) {
+  g_instance_for_testing = prefs;
+}
+
 static base::FilePath::StringType MakePathRelative(const base::FilePath& parent,
                                              const base::FilePath& child) {
   if (!parent.IsParent(child))
     return child.value();
 
   base::FilePath::StringType retval = child.value().substr(
       parent.value().length());
   if (base::FilePath::IsSeparator(retval[0]))
     return retval.substr(1);
   else
@@ skipping 1381 matching lines @@
   for (ExtensionIdList::iterator ext_id = extension_ids.begin();
        ext_id != extension_ids.end(); ++ext_id) {
     ScopedExtensionPrefUpdate update(prefs_, *ext_id);
     // This creates an empty dictionary if none is stored.
     update.Get();
   }
 
   FixMissingPrefs(extension_ids);
   MigratePermissions(extension_ids);
   MigrateDisableReasons(extension_ids);
-  app_sorting_->Initialize(extension_ids);
 
   InitExtensionControlledPrefs(extension_pref_value_map_);
 
   extension_pref_value_map_->NotifyInitializationCompleted();
 }
 
 bool ExtensionPrefs::HasIncognitoPrefValue(const std::string& pref_key) const {
   bool has_incognito_pref_value = false;
   extension_pref_value_map_->GetEffectivePrefValue(pref_key,
                                                    true,
@@ skipping 69 matching lines @@
 void ExtensionPrefs::SetNeedsSync(const std::string& extension_id,
                                   bool needs_sync) {
   UpdateExtensionPref(extension_id, kPrefNeedsSync,
                       needs_sync ? new base::FundamentalValue(true) : nullptr);
 }
 
 ExtensionPrefs::ExtensionPrefs(
     PrefService* prefs,
     const base::FilePath& root_dir,
     ExtensionPrefValueMap* extension_pref_value_map,
-    scoped_ptr<AppSorting> app_sorting,
     scoped_ptr<TimeProvider> time_provider,
     bool extensions_disabled,
     const std::vector<ExtensionPrefsObserver*>& early_observers)
     : prefs_(prefs),
       install_directory_(root_dir),
       extension_pref_value_map_(extension_pref_value_map),
-      app_sorting_(app_sorting.Pass()),
+      app_sorting_(nullptr),
       time_provider_(time_provider.Pass()),
       extensions_disabled_(extensions_disabled) {
-  // TODO(mgiuca): Added these checks to try and diagnose
-  // http://crbug.com/476648. Remove them after the investigation is concluded.
-  CHECK(this);
-  app_sorting_->SetExtensionScopedPrefs(this);
-  app_sorting_->CheckExtensionScopedPrefs();
   MakePathsRelative();
 
   // Ensure that any early observers are watching before prefs are initialized.
   for (std::vector<ExtensionPrefsObserver*>::const_iterator iter =
            early_observers.begin();
        iter != early_observers.end();
        ++iter) {
     AddObserver(*iter);
   }
 
@@ skipping 225 matching lines @@
   extension_pref_value_map_->RegisterExtension(
       extension_id, install_time, is_enabled, is_incognito_enabled);
 
   FOR_EACH_OBSERVER(
       ExtensionPrefsObserver,
       observer_list_,
       OnExtensionRegistered(extension_id, install_time, is_enabled));
 }
 
 }  // namespace extensions