| Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| index f275e0f51e0b0f919786e8f426eb2cb4ff9ee6ab..8a42b77e493716b562d6dd2c994c83901c2968db 100644
|
| --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| @@ -2,9 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind_helpers.h"
|
| #include "base/location.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| @@ -54,7 +55,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
|
| // BrowserProcess::Shutdown() needs to be called in a message loop, so we
|
| // post a task to release the keep alive, then run the message loop.
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| - FROM_HERE, base::Bind(&scoped_ptr<ScopedKeepAlive>::reset,
|
| + FROM_HERE, base::Bind(&std::unique_ptr<ScopedKeepAlive>::reset,
|
| base::Unretained(&keep_alive_), nullptr));
|
| content::RunAllPendingInMessageLoop();
|
|
|
| @@ -232,7 +233,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
|
|
|
| private:
|
| Profile* profile_;
|
| - scoped_ptr<ScopedKeepAlive> keep_alive_;
|
| + std::unique_ptr<ScopedKeepAlive> keep_alive_;
|
| };
|
|
|
| // http://crbug.com/177163
|
|
|