| Index: chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
|
| diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
|
| index ddf66be3a885744ea6d7185fad4506154f14a286..85d6a96c3bd2dfc981f31c031c607f332dff12d9 100644
|
| --- a/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
|
| +++ b/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
|
| @@ -2,8 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/extensions/browser_action_test_util.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
|
| @@ -32,8 +33,8 @@ class ComponentToolbarActionsBrowserTest : public InProcessBrowserTest {
|
| }
|
|
|
| private:
|
| - scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
|
| - scoped_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_;
|
| + std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
|
| + std::unique_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsBrowserTest);
|
| };
|
|
|