| Index: chrome/browser/extensions/permission_message_combinations_unittest.cc
|
| diff --git a/chrome/browser/extensions/permission_message_combinations_unittest.cc b/chrome/browser/extensions/permission_message_combinations_unittest.cc
|
| index f2b762a33115bd892dd99787c70dd583aa088b7b..4619b83ed24e34b9d4dfc40599d897fffbcbbd85 100644
|
| --- a/chrome/browser/extensions/permission_message_combinations_unittest.cc
|
| +++ b/chrome/browser/extensions/permission_message_combinations_unittest.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/command_line.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/test/values_test_util.h"
|
| #include "chrome/browser/extensions/test_extension_environment.h"
|
| #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
|
| @@ -196,7 +197,7 @@ class PermissionMessageCombinationsUnittest : public testing::Test {
|
|
|
| private:
|
| extensions::TestExtensionEnvironment env_;
|
| - scoped_ptr<ChromePermissionMessageProvider> message_provider_;
|
| + std::unique_ptr<ChromePermissionMessageProvider> message_provider_;
|
| scoped_refptr<const Extension> app_;
|
| // Whitelist a known extension id so we can test all permissions. This ID
|
| // will be used for each test app.
|
|
|