| Index: components/feedback/feedback_data_unittest.cc
|
| diff --git a/components/feedback/feedback_data_unittest.cc b/components/feedback/feedback_data_unittest.cc
|
| index 53efa431f0d4f43d749bc6d80991271947e53f7c..5530589d29cfdcfe3529b3409ce5f610e9ec936e 100644
|
| --- a/components/feedback/feedback_data_unittest.cc
|
| +++ b/components/feedback/feedback_data_unittest.cc
|
| @@ -4,10 +4,11 @@
|
|
|
| #include "components/feedback/feedback_data.h"
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <utility>
|
|
|
| -#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 "components/feedback/feedback_uploader.h"
|
| @@ -40,15 +41,15 @@ class MockUploader : public feedback::FeedbackUploader, public KeyedService {
|
| MOCK_METHOD1(DispatchReport, void(const std::string&));
|
| };
|
|
|
| -scoped_ptr<KeyedService> CreateFeedbackUploaderService(
|
| +std::unique_ptr<KeyedService> CreateFeedbackUploaderService(
|
| content::BrowserContext* context) {
|
| - scoped_ptr<MockUploader> uploader(new MockUploader(context));
|
| + std::unique_ptr<MockUploader> uploader(new MockUploader(context));
|
| EXPECT_CALL(*uploader, DispatchReport(testing::_)).Times(1);
|
| return std::move(uploader);
|
| }
|
|
|
| -scoped_ptr<std::string> MakeScoped(const char* str) {
|
| - return scoped_ptr<std::string>(new std::string(str));
|
| +std::unique_ptr<std::string> MakeScoped(const char* str) {
|
| + return base::WrapUnique(new std::string(str));
|
| }
|
|
|
| } // namespace
|
| @@ -93,9 +94,9 @@ class FeedbackDataTest : public testing::Test {
|
| }
|
|
|
| base::Closure quit_closure_;
|
| - scoped_ptr<base::RunLoop> run_loop_;
|
| - scoped_ptr<content::TestBrowserContext> context_;
|
| - scoped_ptr<PrefService> prefs_;
|
| + std::unique_ptr<base::RunLoop> run_loop_;
|
| + std::unique_ptr<content::TestBrowserContext> context_;
|
| + std::unique_ptr<PrefService> prefs_;
|
| scoped_refptr<FeedbackData> data_;
|
| base::MessageLoop message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
|
|