| Index: chrome/browser/extensions/extension_web_ui_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc
|
| index f75a5316ec8af923eb301745e82da2d12cfb41ef..f96b526a2026e95722b25309f67c82a5ae8f980d 100644
|
| --- a/chrome/browser/extensions/extension_web_ui_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
|
| @@ -2,11 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "chrome/browser/extensions/extension_web_ui.h"
|
| +
|
| #include "base/command_line.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| -#include "chrome/browser/extensions/extension_web_ui.h"
|
| #include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
|
| #include "chrome/browser/extensions/test_extension_system.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| @@ -27,9 +29,9 @@ namespace extensions {
|
|
|
| namespace {
|
|
|
| -scoped_ptr<KeyedService> BuildOverrideRegistrar(
|
| +std::unique_ptr<KeyedService> BuildOverrideRegistrar(
|
| content::BrowserContext* context) {
|
| - return make_scoped_ptr(new ExtensionWebUIOverrideRegistrar(context));
|
| + return base::WrapUnique(new ExtensionWebUIOverrideRegistrar(context));
|
| }
|
|
|
| } // namespace
|
| @@ -56,7 +58,7 @@ class ExtensionWebUITest : public testing::Test {
|
| message_loop_.RunUntilIdle();
|
| }
|
|
|
| - scoped_ptr<TestingProfile> profile_;
|
| + std::unique_ptr<TestingProfile> profile_;
|
| ExtensionService* extension_service_;
|
| base::MessageLoop message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
|
|