Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

chrome/browser/extensions/test_extension_prefs.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_PREFS_H_
 #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_PREFS_H_
 
 #include <string>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/test/base/testing_profile.h"
 #include "extensions/common/manifest.h"
 
 class ExtensionPrefValueMap;
 class PrefService;
 class PrefServiceSyncable;
 
 namespace base {
 class DictionaryValue;
 class SequencedTaskRunner;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace extensions {
+class ChromeAppSorting;
 class Extension;
 class ExtensionPrefs;
 
 // This is a test class intended to make it easier to work with ExtensionPrefs
 // in tests.
 class TestExtensionPrefs {
  public:
   explicit TestExtensionPrefs(
       const scoped_refptr<base::SequencedTaskRunner>& task_runner);
   virtual ~TestExtensionPrefs();
 
-  ExtensionPrefs* prefs() { return prefs_.get(); }
-  const ExtensionPrefs& const_prefs() const {
-      return *prefs_.get();
-  }
+  ExtensionPrefs* prefs();
+
   PrefService* pref_service();
   const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry();
   void ResetPrefRegistry();
   const base::FilePath& temp_dir() const { return temp_dir_.path(); }
   const base::FilePath& extensions_dir() const { return extensions_dir_; }
   ExtensionPrefValueMap* extension_pref_value_map() {
     return extension_pref_value_map_.get();
   }
 
   // This will cause the ExtensionPrefs to be deleted and recreated, based on
@@ skipping 26 matching lines @@
 
   // This will add extension in our ExtensionPrefs.
   void AddExtension(Extension* extension);
 
   PrefService* CreateIncognitoPrefService() const;
 
   // Allows disabling the loading of preferences of extensions. Becomes
   // active after calling RecreateExtensionPrefs(). Defaults to false.
   void set_extensions_disabled(bool extensions_disabled);
 
+  ChromeAppSorting* app_sorting();
+
  protected:
   base::ScopedTempDir temp_dir_;
   base::FilePath preferences_file_;
   base::FilePath extensions_dir_;
   scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
   scoped_ptr<PrefServiceSyncable> pref_service_;
-  scoped_ptr<ExtensionPrefs> prefs_;
   scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
   const scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
  private:
+  TestingProfile profile_;
   bool extensions_disabled_;
   DISALLOW_COPY_AND_ASSIGN(TestExtensionPrefs);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_PREFS_H_