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

Unified Diff: components/feedback/feedback_uploader_unittest.cc

Issue 1918083002: Convert //components/[f-n]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: … 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
« no previous file with comments | « components/feedback/feedback_uploader_delegate.cc ('k') | components/feedback/tracing_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/feedback/feedback_uploader_unittest.cc
diff --git a/components/feedback/feedback_uploader_unittest.cc b/components/feedback/feedback_uploader_unittest.cc
index 514f11c31130643ba1c99f04d0086b5d6d9c0780..3736b31c8f79f37efb52c7bef540af7d24ab0ddd 100644
--- a/components/feedback/feedback_uploader_unittest.cc
+++ b/components/feedback/feedback_uploader_unittest.cc
@@ -6,10 +6,11 @@
#include <stddef.h>
+#include <memory>
#include <set>
#include "base/bind.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
@@ -34,9 +35,9 @@ const char kReportFive[] = "five";
const base::TimeDelta kRetryDelayForTest =
base::TimeDelta::FromMilliseconds(100);
-scoped_ptr<KeyedService> CreateFeedbackUploaderService(
+std::unique_ptr<KeyedService> CreateFeedbackUploaderService(
content::BrowserContext* context) {
- return make_scoped_ptr(new feedback::FeedbackUploaderChrome(context));
+ return base::WrapUnique(new feedback::FeedbackUploaderChrome(context));
}
} // namespace
@@ -105,10 +106,10 @@ class FeedbackUploaderTest : public testing::Test {
}
base::MessageLoop message_loop_;
- scoped_ptr<base::RunLoop> run_loop_;
+ std::unique_ptr<base::RunLoop> run_loop_;
content::TestBrowserThread ui_thread_;
- scoped_ptr<content::TestBrowserContext> context_;
- scoped_ptr<PrefService> prefs_;
+ std::unique_ptr<content::TestBrowserContext> context_;
+ std::unique_ptr<PrefService> prefs_;
FeedbackUploader* uploader_;
« no previous file with comments | « components/feedback/feedback_uploader_delegate.cc ('k') | components/feedback/tracing_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698