| Index: chrome/browser/extensions/browser_action_test_util.h
|
| diff --git a/chrome/browser/extensions/browser_action_test_util.h b/chrome/browser/extensions/browser_action_test_util.h
|
| index a95bef64007f7235734dfbc67b615f9b72cc7336..dfb7a530b4e172618e958e85f3b213c467117ff1 100644
|
| --- a/chrome/browser/extensions/browser_action_test_util.h
|
| +++ b/chrome/browser/extensions/browser_action_test_util.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| class Browser;
|
| @@ -99,7 +99,7 @@ class BrowserActionTestUtil {
|
|
|
| // Creates and returns a BrowserActionTestUtil with an "overflow" container,
|
| // with this object's container as the main bar.
|
| - scoped_ptr<BrowserActionTestUtil> CreateOverflowBar();
|
| + std::unique_ptr<BrowserActionTestUtil> CreateOverflowBar();
|
|
|
| // Returns the minimum allowed size of an extension popup.
|
| static gfx::Size GetMinPopupSize();
|
| @@ -115,7 +115,7 @@ class BrowserActionTestUtil {
|
|
|
| // Our test helper, which constructs and owns the views if we don't have a
|
| // real browser window, or if this is an overflow version.
|
| - scoped_ptr<TestToolbarActionsBarHelper> test_helper_;
|
| + std::unique_ptr<TestToolbarActionsBarHelper> test_helper_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BrowserActionTestUtil);
|
| };
|
|
|