| Index: chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
|
| diff --git a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
|
| index cecd1221d19b3ca21cfab19f996ab3aa1a66a56e..a464586cc44220c7b079938e0bfcb95e470f2918 100644
|
| --- a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
|
| +++ b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
|
| @@ -4,13 +4,13 @@
|
|
|
| #include "chrome/browser/ui/webui/options/sync_setup_handler.h"
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/command_line.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/stl_util.h"
|
| #include "base/values.h"
|
| #include "build/build_config.h"
|
| @@ -290,12 +290,12 @@ class SyncSetupHandlerTest : public testing::Test {
|
| }
|
|
|
| content::TestBrowserThreadBundle thread_bundle_;
|
| - scoped_ptr<Profile> profile_;
|
| + std::unique_ptr<Profile> profile_;
|
| ProfileSyncServiceMock* mock_pss_;
|
| GoogleServiceAuthError error_;
|
| SigninManagerBase* mock_signin_;
|
| content::TestWebUI web_ui_;
|
| - scoped_ptr<TestingSyncSetupHandler> handler_;
|
| + std::unique_ptr<TestingSyncSetupHandler> handler_;
|
| };
|
|
|
| class SyncSetupHandlerFirstSigninTest : public SyncSetupHandlerTest {
|
|
|