Index: chrome/browser/extensions/test_extension_system.h |
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h |
index 13065079a8013e688bccd8af119f041e3f434102..7f67470b981f28a38f93e3e5561613d00fc069e3 100644 |
--- a/chrome/browser/extensions/test_extension_system.h |
+++ b/chrome/browser/extensions/test_extension_system.h |
@@ -5,7 +5,8 @@ |
#ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_ |
#define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_SYSTEM_H_ |
-#include "base/memory/scoped_ptr.h" |
+#include <memory> |
+ |
#include "extensions/browser/extension_system.h" |
#include "extensions/common/one_shot_event.h" |
@@ -59,7 +60,7 @@ class TestExtensionSystem : public ExtensionSystem { |
AppSorting* app_sorting() override; |
const OneShotEvent& ready() const override; |
ContentVerifier* content_verifier() override; |
- scoped_ptr<ExtensionSet> GetDependentExtensions( |
+ std::unique_ptr<ExtensionSet> GetDependentExtensions( |
const Extension* extension) override; |
void InstallUpdate(const std::string& extension_id, |
const base::FilePath& temp_dir) override; |
@@ -69,7 +70,7 @@ class TestExtensionSystem : public ExtensionSystem { |
void SetReady() { ready_.Signal(); } |
// Factory method for tests to use with SetTestingProfile. |
- static scoped_ptr<KeyedService> Build(content::BrowserContext* profile); |
+ static std::unique_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 |
@@ -80,14 +81,14 @@ class TestExtensionSystem : public ExtensionSystem { |
Profile* profile_; |
private: |
- scoped_ptr<StateStore> state_store_; |
+ std::unique_ptr<StateStore> state_store_; |
scoped_refptr<TestValueStoreFactory> store_factory_; |
- scoped_ptr<ManagementPolicy> management_policy_; |
- scoped_ptr<RuntimeData> runtime_data_; |
- scoped_ptr<ExtensionService> extension_service_; |
+ std::unique_ptr<ManagementPolicy> management_policy_; |
+ std::unique_ptr<RuntimeData> runtime_data_; |
+ std::unique_ptr<ExtensionService> extension_service_; |
scoped_refptr<InfoMap> info_map_; |
- scoped_ptr<QuotaService> quota_service_; |
- scoped_ptr<AppSorting> app_sorting_; |
+ std::unique_ptr<QuotaService> quota_service_; |
+ std::unique_ptr<AppSorting> app_sorting_; |
OneShotEvent ready_; |
}; |