Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/test_extension_system.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_TEST_EXTENSION_SYSTEM_H_
 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "extensions/browser/extension_system.h"
@@ skipping 10 matching lines @@
 
 namespace content {
 class BrowserContext;
 }
 
 namespace extensions {
 class ExtensionPrefs;
 class InstallVerifier;
 class RuntimeData;
 class SharedUserScriptMaster;
 class StandardManagementPolicyProvider;

[not at google - send to devlin, 2015/08/03 21:12:08]

Cleanup: InstallVerifier and StandardManagementPolicyProvider aren't used, and
RuntimeData and SharedUserScriptMaster are unnecessary because they're
overrides.

[Marc Treib, 2015/08/04 08:36:28]

And ExtensionPrefs also isn't used :)
Done.

 
 // Test ExtensionSystem, for use with TestingProfile.
 class TestExtensionSystem : public ExtensionSystem {
  public:
   explicit TestExtensionSystem(Profile* profile);
   ~TestExtensionSystem() override;
 
   // KeyedService implementation.
   void Shutdown() override;
 
-  // Creates an ExtensionPrefs with the testing profile and returns it.
-  // Useful for tests that need to modify prefs before creating the
-  // ExtensionService.
-  scoped_ptr<ExtensionPrefs> CreateExtensionPrefs(
-      const base::CommandLine* command_line,
-      const base::FilePath& install_directory);
-
   // Creates an ExtensionService initialized with the testing profile and
   // returns it, and creates ExtensionPrefs if it hasn't been created yet.
   ExtensionService* CreateExtensionService(
       const base::CommandLine* command_line,
       const base::FilePath& install_directory,
       bool autoupdate_enabled);
 
   void CreateSocketManager();
 
   void InitForRegularProfile(bool extensions_enabled) override {}
   void SetExtensionService(ExtensionService* service);
   ExtensionService* extension_service() override;
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   SharedUserScriptMaster* shared_user_script_master() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   TestingValueStore* value_store() { return value_store_; }
   InfoMap* info_map() override;
   QuotaService* quota_service() override;
+  AppSorting* app_sorting() override;
   const OneShotEvent& ready() const override;
   ContentVerifier* content_verifier() override;
   scoped_ptr<ExtensionSet> GetDependentExtensions(
       const Extension* extension) override;
 
   // Note that you probably want to use base::RunLoop().RunUntilIdle() right
   // after this to run all the accumulated tasks.
   void SetReady() { ready_.Signal(); }
 
   // Factory method for tests to use with SetTestingProfile.
   static scoped_ptr<KeyedService> Build(content::BrowserContext* profile);
 
+  // Used by ExtensionPrefsTest to re-create the AppSorting after it has
+  // re-created the ExtensionPrefs instance (this can never happen in non-test
+  // code).
+  void RecreateAppSorting();
+
  protected:
   Profile* profile_;
 
  private:
   scoped_ptr<StateStore> state_store_;
   // A pointer to the TestingValueStore owned by |state_store_|.
   TestingValueStore* value_store_;
   scoped_ptr<ManagementPolicy> management_policy_;
   scoped_ptr<RuntimeData> runtime_data_;
   scoped_ptr<ExtensionService> extension_service_;
   scoped_refptr<InfoMap> info_map_;
   scoped_ptr<QuotaService> quota_service_;
+  scoped_ptr<AppSorting> app_sorting_;
   OneShotEvent ready_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_