Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Unified Diff: chrome/browser/chromeos/extensions/external_cache_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/external_cache_unittest.cc
diff --git a/chrome/browser/chromeos/extensions/external_cache_unittest.cc b/chrome/browser/chromeos/extensions/external_cache_unittest.cc
index 5b31a837dfa5e24fd6b10e19d55b6da3eec9f599..091ecac85ff4af1483dd0323ee13401e5f7bc96b 100644
--- a/chrome/browser/chromeos/extensions/external_cache_unittest.cc
+++ b/chrome/browser/chromeos/extensions/external_cache_unittest.cc
@@ -140,14 +140,14 @@ class ExternalCacheTest : public testing::Test,
content::TestBrowserThreadBundle thread_bundle_;
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
- scoped_ptr<net::TestURLFetcherFactory> fetcher_factory_;
+ std::unique_ptr<net::TestURLFetcherFactory> fetcher_factory_;
- scoped_ptr<base::SequencedWorkerPoolOwner> pool_owner_;
+ std::unique_ptr<base::SequencedWorkerPoolOwner> pool_owner_;
scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
base::ScopedTempDir cache_dir_;
base::ScopedTempDir temp_dir_;
- scoped_ptr<base::DictionaryValue> prefs_;
+ std::unique_ptr<base::DictionaryValue> prefs_;
std::map<std::string, std::string> installed_extensions_;
ScopedTestDeviceSettingsService test_device_settings_service_;
@@ -161,7 +161,7 @@ TEST_F(ExternalCacheTest, Basic) {
ExternalCache external_cache(cache_dir, request_context_getter(),
background_task_runner(), this, true, false);
- scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
+ std::unique_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
base::DictionaryValue* dict = CreateEntryWithUpdateUrl(true);
prefs->Set(kTestExtensionId1, dict);
CreateExtensionFile(cache_dir, kTestExtensionId1, "1");
@@ -263,7 +263,7 @@ TEST_F(ExternalCacheTest, Basic) {
GetExtensionFile(cache_dir, kTestExtensionId2, "2")));
// Shutdown with callback OnExtensionListsUpdated that clears prefs.
- scoped_ptr<base::DictionaryValue> empty(new base::DictionaryValue);
+ std::unique_ptr<base::DictionaryValue> empty(new base::DictionaryValue);
external_cache.Shutdown(
base::Bind(&ExternalCacheTest::OnExtensionListsUpdated,
base::Unretained(this),
@@ -284,7 +284,7 @@ TEST_F(ExternalCacheTest, PreserveInstalled) {
ExternalCache external_cache(cache_dir, request_context_getter(),
background_task_runner(), this, true, false);
- scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
+ std::unique_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
prefs->Set(kTestExtensionId1, CreateEntryWithUpdateUrl(true));
prefs->Set(kTestExtensionId2, CreateEntryWithUpdateUrl(true));

Powered by Google App Engine
This is Rietveld 408576698